diff options
36 files changed, 752 insertions, 67 deletions
diff --git a/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch b/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch index a6fff7adf9..4d1fbb6518 100644 --- a/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch +++ b/packages/dgen/dgen-sdl-1.23/fix-configure-and-make.patch @@ -1,7 +1,8 @@ -diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am dgen-sdl-1.23/Makefile.am ---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am 2001-02-22 00:14:21 +00:00 -+++ dgen-sdl-1.23/Makefile.am 2005-02-24 23:21:05 +00:00 -@@ -5,7 +5,7 @@ +Index: dgen-sdl-1.23/Makefile.am +=================================================================== +--- dgen-sdl-1.23.orig/Makefile.am ++++ dgen-sdl-1.23/Makefile.am +@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.asm.am DIST_SUBDIRS = star musa mz80 sdl SUBDIRS = @CPUDIRS@ @INTERFACE@ @@ -10,9 +11,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.am dgen-sdl-1.23/Makefile. bin_PROGRAMS = dgen tobin -diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am dgen-sdl-1.23/Makefile.asm.am ---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am 2000-01-14 00:55:49 +00:00 -+++ dgen-sdl-1.23/Makefile.asm.am 2005-02-24 23:21:05 +00:00 +Index: dgen-sdl-1.23/Makefile.asm.am +=================================================================== +--- dgen-sdl-1.23.orig/Makefile.asm.am ++++ dgen-sdl-1.23/Makefile.asm.am @@ -1,5 +1,5 @@ # Tell how to make assembler files -SUFFIXES += .asmu .asm @@ -20,10 +22,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/Makefile.asm.am dgen-sdl-1.23/Makef .asm.o: @NASM@ -f @NASM_FMT@ $< -diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configure.in ---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in 2001-07-02 19:34:18 +01:00 -+++ dgen-sdl-1.23/configure.in 2005-02-25 00:20:08 +00:00 -@@ -62,41 +62,39 @@ +Index: dgen-sdl-1.23/configure.in +=================================================================== +--- dgen-sdl-1.23.orig/configure.in ++++ dgen-sdl-1.23/configure.in +@@ -62,41 +62,39 @@ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS" EXTRAOBJS= dnl Check for SDL joystick @@ -31,20 +34,15 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur -AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, - dnl Check for Linux joystick as a backup - AC_CHECK_HEADER(linux/joystick.h, JOYSTICK_SUPPORT=LINUX)) -+AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no) - +- -dnl Check for X (so we can find the OpenGL headers) -AC_PATH_XTRA -CFLAGS="$CFLAGS $X_CFLAGS" -CXXFLAGS="$CXXFLAGS $X_CFLAGS" -LIBS="$LIBS $X_LIBS" -+#dnl Check for X (so we can find the OpenGL headers) -+#AC_PATH_XTRA -+#CFLAGS="$CFLAGS $X_CFLAGS" -+#CXXFLAGS="$CXXFLAGS $X_CFLAGS" -+#LIBS="$LIBS $X_LIBS" ++AC_CHECK_HEADER(SDL_joystick.h, JOYSTICK_SUPPORT=SDL, JOYSTICK_SUPPORT=no) - dnl Check for OpenGL support in SDL +-dnl Check for OpenGL support in SDL -AC_ARG_WITH(opengl, - [ --without-opengl Don't use SDL OpenGL support], - OPENGL_SUPPORT=$withval, OPENGL_SUPPORT=yes) @@ -66,8 +64,14 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur - LIBS=$oldLIBS - CPPFLAGS=$oldCPPFLAGS - fi -- ++#dnl Check for X (so we can find the OpenGL headers) ++#AC_PATH_XTRA ++#CFLAGS="$CFLAGS $X_CFLAGS" ++#CXXFLAGS="$CXXFLAGS $X_CFLAGS" ++#LIBS="$LIBS $X_LIBS" + -fi ++dnl Check for OpenGL support in SDL +OPENGL_SUPPORT=no +#AC_ARG_WITH(opengl, +# [ --without-opengl Don't use SDL OpenGL support], @@ -95,7 +99,7 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur if test x$OPENGL_SUPPORT \!= xno; then AC_DEFINE(SDL_OPENGL_SUPPORT) -@@ -166,8 +164,11 @@ +@@ -166,8 +164,11 @@ changequote([,]) else CHOP_=cat fi @@ -109,10 +113,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/configure.in dgen-sdl-1.23/configur dnl Check for MMX AC_ARG_WITH(mmx, -diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am dgen-sdl-1.23/musa/Makefile.am ---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am 2000-01-29 00:46:22 +00:00 -+++ dgen-sdl-1.23/musa/Makefile.am 2005-02-25 01:10:38 +00:00 -@@ -8,7 +8,10 @@ +Index: dgen-sdl-1.23/musa/Makefile.am +=================================================================== +--- dgen-sdl-1.23.orig/musa/Makefile.am ++++ dgen-sdl-1.23/musa/Makefile.am +@@ -8,7 +8,10 @@ noinst_PROGRAMS = m68kmake noinst_LIBRARIES = libmusa68.a @@ -124,9 +129,10 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/musa/Makefile.am dgen-sdl-1.23/musa m68kops.c: m68kmake ./m68kmake -diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am dgen-sdl-1.23/mz80/Makefile.am ---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am 2000-10-27 00:08:19 +01:00 -+++ dgen-sdl-1.23/mz80/Makefile.am 2005-02-25 00:22:19 +00:00 +Index: dgen-sdl-1.23/mz80/Makefile.am +=================================================================== +--- dgen-sdl-1.23.orig/mz80/Makefile.am ++++ dgen-sdl-1.23/mz80/Makefile.am @@ -3,13 +3,11 @@ include $(top_srcdir)/Makefile.asm.am @@ -145,10 +151,11 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/mz80/Makefile.am dgen-sdl-1.23/mz80 EXTRA_DIST = mz80.txt -diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am dgen-sdl-1.23/sdl/Makefile.am ---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am 2001-02-10 19:34:28 +00:00 -+++ dgen-sdl-1.23/sdl/Makefile.am 2005-02-25 01:26:27 +00:00 -@@ -3,11 +3,14 @@ +Index: dgen-sdl-1.23/sdl/Makefile.am +=================================================================== +--- dgen-sdl-1.23.orig/sdl/Makefile.am ++++ dgen-sdl-1.23/sdl/Makefile.am +@@ -3,12 +3,15 @@ EXTRA_DIST = dgenfont.pbm chartfont.c @@ -158,16 +165,18 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/sdl/Makefile.am dgen-sdl-1.23/sdl/M noinst_PROGRAMS = pbm2df noinst_LIBRARIES = libpd.a -+ + +pbm2df: pbm2df.c + $(HOSTCC) -o pbm2df pbm2df.c - ++ # built sources -diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am dgen-sdl-1.23/star/Makefile.am ---- ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am 2001-07-02 22:48:27 +01:00 -+++ dgen-sdl-1.23/star/Makefile.am 2005-02-24 23:21:05 +00:00 -@@ -7,7 +7,7 @@ + BUILT_SOURCES = dgenfont.cpp +Index: dgen-sdl-1.23/star/Makefile.am +=================================================================== +--- dgen-sdl-1.23.orig/star/Makefile.am ++++ dgen-sdl-1.23/star/Makefile.am +@@ -7,7 +7,7 @@ include $(top_srcdir)/Makefile.asm.am # license) EXTRA_DIST = cpudebug.c cpudebug.h star.c starcpu.h stardoc.txt @@ -176,3 +185,17 @@ diff -urNd ../dgen-sdl-1.23-r0/dgen-sdl-1.23/star/Makefile.am dgen-sdl-1.23/star noinst_LIBRARIES = libstarcpu.a +Index: dgen-sdl-1.23/musa/m68kcpu.h +=================================================================== +--- dgen-sdl-1.23.orig/musa/m68kcpu.h ++++ dgen-sdl-1.23/musa/m68kcpu.h +@@ -51,7 +51,8 @@ + #define int32 long + + /* int and unsigned int must be at least 32 bits wide */ +-#define uint unsigned int ++//#define uint unsigned int ++typedef unsigned int uint; + + + /* Allow for architectures that don't have 8-bit sizes */ diff --git a/packages/dgen/dgen-sdl_1.23.bb b/packages/dgen/dgen-sdl_1.23.bb index 00a39f9ce1..e682a3163d 100644 --- a/packages/dgen/dgen-sdl_1.23.bb +++ b/packages/dgen/dgen-sdl_1.23.bb @@ -1,12 +1,14 @@ -inherit autotools - -DEFAULT_PREFERENCE = "-1" - -SECTION = "x11/games" DESCRIPTION = "DGen/SDL is a Sega Genesis/Mega-drive emulator." DEPENDS = "virtual/libsdl" -SRC_URI = "http://pknet.com/~joe/${PN}-${PV}.tar.gz \ - file://fix-configure-and-make.patch;patch=1" +SECTION = "x11/games" +LICENSE = "BSD" + +SRC_URI = "\ + http://pknet.com/~joe/${PN}-${PV}.tar.gz \ + file://fix-configure-and-make.patch;patch=1 \ +" + +inherit autotools EXTRA_OECONF = " --disable-sdltest --without-x --without-opengl --without-nasm --without-mmx --without-star" diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index d05e65d281..c93261283f 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r20" +PR = "r21" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" @@ -14,7 +14,7 @@ FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a" -SRCREV_arm = "af7bda5224b6cdfb0c1f03686d2a6b631a455668" +SRCREV_arm = "3c4b8ba71b922be6559fcfea3cb990ea3ded234d" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty b/packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty +++ b/packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty diff --git a/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch new file mode 100644 index 0000000000..17b85f758d --- /dev/null +++ b/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch @@ -0,0 +1,15 @@ +--- + fontconfig.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- fontconfig-2.6.0.orig/fontconfig.pc.in ++++ fontconfig-2.6.0/fontconfig.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: Fontconfig + Description: Font configuration and customization library + Version: @VERSION@ + Libs: -L${libdir} -lfontconfig +-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ ++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype + Cflags: -I${includedir} diff --git a/packages/fontconfig/fontconfig-native_2.6.0.bb b/packages/fontconfig/fontconfig-native_2.6.0.bb new file mode 100644 index 0000000000..541b74634c --- /dev/null +++ b/packages/fontconfig/fontconfig-native_2.6.0.bb @@ -0,0 +1,15 @@ +SECTION = "base" +LICENSE = "BSD" +require fontconfig_${PV}.bb +inherit native +DEPENDS = "freetype-native expat-native zlib-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" + +EXTRA_OEMAKE = "" +EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" + +do_stage () { + oe_runmake install + install fc-lang/fc-lang ${STAGING_BINDIR} + install fc-glyphname/fc-glyphname ${STAGING_BINDIR} +} diff --git a/packages/fontconfig/fontconfig_2.6.0.bb b/packages/fontconfig/fontconfig_2.6.0.bb new file mode 100644 index 0000000000..3f7eca4b4e --- /dev/null +++ b/packages/fontconfig/fontconfig_2.6.0.bb @@ -0,0 +1,76 @@ +SECTION = "libs" +LICENSE = "BSD" +DESCRIPTION = "A library for configuring and customizing font access." +DEPENDS = "expat freetype zlib" + +SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ + file://fix-pkgconfig.patch;patch=1" + +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" +FILES_fontconfig-utils = "${bindir}/*" + +# Work around past breakage in debian.bbclass +RPROVIDES_fontconfig-utils = "libfontconfig-utils" +RREPLACES_fontconfig-utils = "libfontconfig-utils" +RCONFLICTS_fontconfig-utils = "libfontconfig-utils" +DEBIAN_NOAUTONAME_fontconfig-utils = "1" + +S = "${WORKDIR}/fontconfig-${PV}" + +PARALLEL_MAKE = "" + +inherit autotools pkgconfig + +export HASDOCBOOK="no" + +EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}" +EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname" + +# The tarball has some of the patched files as read only, which +# patch doesn't like at all + +fontconfig_do_unpack() { + chmod -R u+rw ${S} +} + +python do_unpack () { + bb.build.exec_func('base_do_unpack', d) + bb.build.exec_func('fontconfig_do_unpack', d) +} + +do_stage () { + oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/fontconfig + for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done +} + +BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2" + +do_configure_append () { + sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile + sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile + sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile + sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile + + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile + + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile + + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile + +} + +do_install () { + autotools_do_install +} + diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc index 8f9b34b252..c2ee5317bf 100644 --- a/packages/glibc/glibc.inc +++ b/packages/glibc/glibc.inc @@ -17,4 +17,6 @@ LEAD_SONAME = "libc.so" GLIBC_EXTRA_OECONF ?= "" INHIBIT_DEFAULT_DEPS = "1" +ARM_INSTRUCTION_SET = "arm" + PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 60eb071032..6faa3df9af 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,8 +1,6 @@ require glibc.inc PR = "r10" -ARM_INSTRUCTION_SET = "arm" - PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" diff --git a/packages/libusb/libusb1-0.9.0/.mtn2git_empty b/packages/gsoap/gsoap-native/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/libusb/libusb1-0.9.0/.mtn2git_empty +++ b/packages/gsoap/gsoap-native/.mtn2git_empty diff --git a/packages/gsoap/gsoap-native/use-just-built-binary.patch b/packages/gsoap/gsoap-native/use-just-built-binary.patch new file mode 100644 index 0000000000..f7e4811f9e --- /dev/null +++ b/packages/gsoap/gsoap-native/use-just-built-binary.patch @@ -0,0 +1,19 @@ +--- + soapcpp2/wsdl/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am ++++ gsoap-2.7/soapcpp2/wsdl/Makefile.am +@@ -13,11 +13,11 @@ SOAP_CPP_SRC=wsdlC.cpp + SOAPHEADER=wsdl.h + SOAP_FLAGS=-SC -pwsdl + BUILT_SOURCES=$(SOAP_CPP_SRC) + + $(SOAP_CPP_SRC) : $(SOAPHEADER) +- $(SOAP) $(SOAP_FLAGS) $(SOAPHEADER) ++ ../src/soapcpp2 $(SOAP_FLAGS) $(SOAPHEADER) + + #LIBS= + + bin_PROGRAMS=wsdl2h + diff --git a/packages/gsoap/gsoap-native_2.7.7.bb b/packages/gsoap/gsoap-native_2.7.7.bb index b7553b404d..206208d329 100644 --- a/packages/gsoap/gsoap-native_2.7.7.bb +++ b/packages/gsoap/gsoap-native_2.7.7.bb @@ -1,6 +1,9 @@ require gsoap_${PV}.bb DEPENDS = "" +PR = "r1" + +SRC_URI += "file://use-just-built-binary.patch;patch=1" inherit native @@ -11,4 +14,3 @@ do_stage() { do_install() { : } - diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/.mtn2git_empty b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/.mtn2git_empty diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch index 501ba3fb29..501ba3fb29 100644 --- a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch +++ b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch diff --git a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb index fec42b1df7..34cc1ac50d 100644 --- a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb +++ b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb @@ -5,15 +5,15 @@ SECTION = "libs" LICENSE = "LGPL" PE = "1" -PR = "r1" +PR = "r0" DEPENDS = "libusb1" -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta1.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta2.tar.bz2 \ file://0.1.0-beta1-gcc3.4-fix.patch;patch=1 \ " -S = "${WORKDIR}/libusb-compat-0.1.0-beta1" +S = "${WORKDIR}/libusb-compat-0.1.0-beta2" inherit autotools pkgconfig binconfig lib_package diff --git a/packages/libusb/libusb1-0.9.2/.mtn2git_empty b/packages/libusb/libusb1-0.9.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libusb/libusb1-0.9.2/.mtn2git_empty diff --git a/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch b/packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch index 1b06945d1a..1b06945d1a 100644 --- a/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch +++ b/packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch diff --git a/packages/libusb/libusb1_0.9.0.bb b/packages/libusb/libusb1_0.9.2.bb index ce102c0cfc..2c144f053d 100644 --- a/packages/libusb/libusb1_0.9.0.bb +++ b/packages/libusb/libusb1_0.9.2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" LICENSE = "LGPL" -PR = "r1" +PR = "r0" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb index 563a2c5aaa..77b68decf6 100644 --- a/packages/linux/linux-neuros_git.bb +++ b/packages/linux/linux-neuros_git.bb @@ -2,10 +2,10 @@ require linux.inc DESCRIPTION = "Linux kernel for Neuros OSD devices" -SRCREV = "d2867be8abb7d67442cec3ae13d782f1254835d8" +SRCREV = "3560f6dca0c8dd97d9e2a935f68303effb3b8cc5" PV = "2.6.23-${PR}+git${SRCREV}" -PR = "r9" +PR = "r10" COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)" diff --git a/packages/nandlogical/.mtn2git_empty b/packages/nandlogical/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nandlogical/.mtn2git_empty diff --git a/packages/nandlogical/files/.mtn2git_empty b/packages/nandlogical/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nandlogical/files/.mtn2git_empty diff --git a/packages/nandlogical/files/nandlogical.c b/packages/nandlogical/files/nandlogical.c new file mode 100644 index 0000000000..d88d1c212f --- /dev/null +++ b/packages/nandlogical/files/nandlogical.c @@ -0,0 +1,386 @@ +/* + NAND logical utility for Sharp Zaurus SL-C7x0/860/7500/Cxx00 + version 1.0 + Copyright 2006 Alexander Chukov <sash@pdaXrom.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + */ + +#define _GNU_SOURCE +#include <ctype.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <getopt.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/stat.h> + +#include <asm/types.h> +#include <mtd/mtd-user.h> + +int fd; + +unsigned char *readbuf; +unsigned char *oobbuf; +unsigned long *log2phy; + +struct mtd_oob_buf oob = {0, 16, NULL}; + +struct nand_oobinfo none_oobinfo = { + .useecc = MTD_NANDECC_OFF, +}; + +#define NAND_LOGICAL_SIZE (7 * 1024 * 1024) + +///////////////////////////////////////////////////////////////////// +// oob structure +///////////////////////////////////////////////////////////////////// + +#define NAND_NOOB_LOGADDR_00 8 +#define NAND_NOOB_LOGADDR_01 9 +#define NAND_NOOB_LOGADDR_10 10 +#define NAND_NOOB_LOGADDR_11 11 +#define NAND_NOOB_LOGADDR_20 12 +#define NAND_NOOB_LOGADDR_21 13 + +static uint nand_get_logical_no(unsigned char *oob) +{ + unsigned short us,bit; + int par; + int good0, good1; + + if(oob[NAND_NOOB_LOGADDR_00] == oob[NAND_NOOB_LOGADDR_10] && + oob[NAND_NOOB_LOGADDR_01] == oob[NAND_NOOB_LOGADDR_11]){ + good0 = NAND_NOOB_LOGADDR_00; + good1 = NAND_NOOB_LOGADDR_01; + }else + if(oob[NAND_NOOB_LOGADDR_10] == oob[NAND_NOOB_LOGADDR_20] && + oob[NAND_NOOB_LOGADDR_11] == oob[NAND_NOOB_LOGADDR_21]){ + good0 = NAND_NOOB_LOGADDR_10; + good1 = NAND_NOOB_LOGADDR_11; + }else + if(oob[NAND_NOOB_LOGADDR_20] == oob[NAND_NOOB_LOGADDR_00] && + oob[NAND_NOOB_LOGADDR_21] == oob[NAND_NOOB_LOGADDR_01]){ + good0 = NAND_NOOB_LOGADDR_20; + good1 = NAND_NOOB_LOGADDR_21; + }else{ + return (uint)-1; + } + + us = (((unsigned short)(oob[good0]) & 0x00ff) << 0) | + (((unsigned short)(oob[good1]) & 0x00ff) << 8); + + par = 0; + for(bit = 0x0001; bit != 0; bit <<= 1){ + if(us & bit){ + par++; + } + } + if(par & 1){ + return (uint)-2; + } + + if(us == 0xffff){ + return 0xffff; + }else{ + return ((us & 0x07fe) >> 1); + } +} + +static void nand_set_logical_no(uint log_no, unsigned char *oob) +{ + unsigned short us,bit; + int par; + + us = (((log_no & 0x03ff) << 1) | 0x1000); + + par = 0; + for(bit = 0x0001; bit != 0; bit <<= 1){ + if(us & bit){ + par++; + } + } + if(par & 1){ + us |= 0x0001; + } + + oob[NAND_NOOB_LOGADDR_00] = (unsigned char)((us & 0x00ff) >> 0); + oob[NAND_NOOB_LOGADDR_01] = (unsigned char)((us & 0xff00) >> 8); + oob[NAND_NOOB_LOGADDR_10] = oob[NAND_NOOB_LOGADDR_00]; + oob[NAND_NOOB_LOGADDR_11] = oob[NAND_NOOB_LOGADDR_01]; + oob[NAND_NOOB_LOGADDR_20] = oob[NAND_NOOB_LOGADDR_00]; + oob[NAND_NOOB_LOGADDR_21] = oob[NAND_NOOB_LOGADDR_01]; +} + +void scan_logical(int blocks, int erasesize) +{ + int i; + unsigned long offset; + int ret = 1; + for (i = 0; i < blocks; i++) + log2phy[i] = (uint) -1; + offset = 0; + for (i = 0; i < blocks; i++) { + oob.start = offset; + ret = ioctl(fd, MEMREADOOB, &oob); + + //ret = nand_read_raw(nand, oobuf, offset, nand->writesize, nand->oobsize); + if (!ret) { + int log_no = nand_get_logical_no(oobbuf); + if (((int)log_no >= 0) && (log_no < blocks)) { + log2phy[log_no] = offset; + //printf("NAND logical - %08X -> %04X\n", offset, log_no * erasesize); + } else { + //printf("NAND logical - %08X - skip (%x)\n", offset, log_no); + } + } else { + //printf("NAND logical - offset %x read OOB problem\n", offset); + } + offset += erasesize; + } +} + +unsigned long add_logical(unsigned long ofs, int blocks, int erasesize, int bs) +{ + erase_info_t erase; + unsigned long offset = 0; + int i; + int ret; + + erase.length = erasesize; + + for (i = 0; i < blocks; i++) { + oob.start = offset; + ret = ioctl(fd, MEMREADOOB, &oob); + + if (!ret) { + int log_no = nand_get_logical_no(oobbuf); + +//printf("-- %x\n", log_no); + + if ((short)log_no == -1) { + int j = 0; + { + loff_t offs = offset; + erase.start = offset; + int ret = ioctl(fd, MEMGETBADBLOCK, &offs); + if (ret > 0) { + printf ("\nSkipping bad block at 0x%08x\n", erase.start); + goto nextblock; + } else if (ret < 0) { + perror("ioctl(MEMGETBADBLOCK)"); + exit(1); + } else { + printf("%x - no bad block\n", offset); + } + + if (ioctl(fd, MEMERASE, &erase) != 0) { + perror("ioctl(MEMERASE)"); + goto nextblock; + } + + //printf("%x - erased\n", offset); + + } + + //printf("NAND logical - found free block %x, mapped as %x\n", offset, ofs); + + log2phy[ofs / erasesize] = offset; + + return offset; + } else { + //fprintf(stderr, "found: %x\n", log_no); + } + } else { + perror ("ioctl(MEMREADOOB)"); + } + + nextblock: + offset += erasesize; + } + + return (unsigned long)-1; +} |