diff options
| -rw-r--r-- | packages/libcap/libcap-1.10/syscall.patch | 20 | ||||
| -rw-r--r-- | packages/meta/oplinux-packages.bb | 49 | ||||
| -rw-r--r-- | packages/scummvm/scummvm-qpe_0.6.1b.bb | 2 | ||||
| -rw-r--r-- | packages/scummvm/scummvm_0.6.0.bb | 2 | ||||
| -rw-r--r-- | packages/scummvm/scummvm_0.6.1b.bb | 2 | ||||
| -rw-r--r-- | packages/scummvm/scummvm_0.9.0.bb | 2 | ||||
| -rw-r--r-- | packages/scummvm/scummvm_0.9.1.bb | 16 |
7 files changed, 64 insertions, 29 deletions
diff --git a/packages/libcap/libcap-1.10/syscall.patch b/packages/libcap/libcap-1.10/syscall.patch new file mode 100644 index 0000000000..86163f2b1a --- /dev/null +++ b/packages/libcap/libcap-1.10/syscall.patch @@ -0,0 +1,20 @@ +Index: libcap-1.10/libcap/cap_sys.c +=================================================================== +--- libcap-1.10.orig/libcap/cap_sys.c 2007-05-24 10:59:24.000000000 +0200 ++++ libcap-1.10/libcap/cap_sys.c 2007-05-24 11:01:42.000000000 +0200 +@@ -11,6 +11,7 @@ + #define __LIBRARY__ + #include <linux/unistd.h> + ++#if 0 + _syscall2(int, capget, + cap_user_header_t, header, + cap_user_data_t, data) +@@ -18,6 +19,7 @@ + _syscall2(int, capset, + cap_user_header_t, header, + const cap_user_data_t, data) ++#endif + + /* + * $Log: cap_sys.c,v $ diff --git a/packages/meta/oplinux-packages.bb b/packages/meta/oplinux-packages.bb index 2b43a39720..dcbbea9f95 100644 --- a/packages/meta/oplinux-packages.bb +++ b/packages/meta/oplinux-packages.bb @@ -14,41 +14,40 @@ ALLOW_EMPTY = "1" python __anonymous () { - import bb + import bb - #Get all the packages we can build/exist in OE - package_list = bb.data.getVar('PACKAGES_LIST', d) or "none" - package_list=package_list.split() - - #Get the packages that are broken on all architectures - broken_package_list = bb.data.expand('${OPLINUX_BROKEN_PACKAGES}', d) +#Get all the packages we can build/exist in OE + package_list = bb.data.getVar('PACKAGES_LIST', d) or "none" + package_list = package_list.split() + +#Get the packages that are broken on all architectures + broken_package_list = bb.data.expand('${OPLINUX_BROKEN_PACKAGES}', d) - # Get the arch we are building for - building_arch = bb.data.getVar('FEED_ARCH',d) +#Get the arch we are building for + building_arch = bb.data.getVar('FEED_ARCH',d) - #Now add the broken packages list the ones that fail for the arch we build now - if (building_arch=="i468") or (building_arch=="i568") or (building_arch=="i668"): - broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_x8}', d) +#Now add the broken packages list the ones that fail for the arch we build now + if (building_arch=="i486") or (building_arch=="i586") or (building_arch=="i686"): + broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_x8}', d) - elif (building_arch=="ppc405"): - broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_PPC}', d) + elif (building_arch=="ppc405"): + broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_PPC}', d) - elif (building_arch=="ppc603e"): - broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_POWERPC}', d) + elif (building_arch=="ppc603e"): + broken_package_list = broken_package_list + bb.data.expand('${OPLINUX_BROKEN_PACKAGES_ARCH_POWERPC}', d) + for chk_package in package_list : + build_package="yes" - for chk_package in package_list : - build_package="yes" - if chk_package in broken_package_list: - build_package="no" - else : - bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + chk_package +" "), d) + if chk_package in broken_package_list: + build_package="no" + else : + bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + chk_package +" "), d) #add the OPLinux extra packages to the DEPENDS list - bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + bb.data.getVar('OPLINUX_EXTRA_PACKAGES', d)), d) - + bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + bb.data.getVar('OPLINUX_EXTRA_PACKAGES', d)), d) - bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + "package-index"), d) + bb.data.setVar('DEPENDS', (bb.data.getVar('DEPENDS', d) + "package-index"), d) } diff --git a/packages/scummvm/scummvm-qpe_0.6.1b.bb b/packages/scummvm/scummvm-qpe_0.6.1b.bb index 44035e633c..50d107deeb 100644 --- a/packages/scummvm/scummvm-qpe_0.6.1b.bb +++ b/packages/scummvm/scummvm-qpe_0.6.1b.bb @@ -1,5 +1,5 @@ require scummvm.inc -DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2" +DEPENDS = "libsdl-qpe libmad tremor libogg zlib mpeg2dec" S="${WORKDIR}/scummvm-${PV}/" diff --git a/packages/scummvm/scummvm_0.6.0.bb b/packages/scummvm/scummvm_0.6.0.bb index 1aecd20bc4..852ca5ff1e 100644 --- a/packages/scummvm/scummvm_0.6.0.bb +++ b/packages/scummvm/scummvm_0.6.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL." SECTION = "opie/games" PRIORITY = "optional" -DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2" +DEPENDS = "libsdl-qpe libmad tremor libogg zlib mpeg2dec" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \ diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb index 67762708a9..a1d3dce944 100644 --- a/packages/scummvm/scummvm_0.6.1b.bb +++ b/packages/scummvm/scummvm_0.6.1b.bb @@ -1,5 +1,5 @@ require scummvm.inc -DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" +DEPENDS = "virtual/libsdl libmad tremor libogg zlib mpeg2dec" SRC_URI += " file://mouse.patch;patch=1 \ file://gcc-4.x.x-accept.patch;patch=1 \ file://sh3-linux-new-arch.patch;patch=1 \ diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb index 9719ee200e..0403e6ae90 100644 --- a/packages/scummvm/scummvm_0.9.0.bb +++ b/packages/scummvm/scummvm_0.9.0.bb @@ -1,5 +1,5 @@ require scummvm.inc -DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib libmpeg2" +DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec" SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1" EXTRA_OECONF += "--enable-lure \ diff --git a/packages/scummvm/scummvm_0.9.1.bb b/packages/scummvm/scummvm_0.9.1.bb new file mode 100644 index 0000000000..5d1e2c1e27 --- /dev/null +++ b/packages/scummvm/scummvm_0.9.1.bb @@ -0,0 +1,16 @@ +DEFAULT_PREFERENCE = "-1" + +require scummvm.inc +DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec" + +EXTRA_OECONF += "--enable-lure \ + --enable-agi \ + --enable-cine \ + " + +do_compile() { + oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ + DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2" +} + + |