diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-12-11 09:00:04 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-12-11 09:00:04 +0000 |
commit | 79a819b6b9ba15ae6c55ca688d279dab715af0a0 (patch) | |
tree | 8d468974c1c5500ececaa8be0b75014f3e82dea2 /packages | |
parent | 8483b7301dc68c0e5ffc5c7157b723f5a0a0fdeb (diff) | |
parent | c644668e3ff839df99c1a417c62c6444b87e6432 (diff) |
merge of '1a297661067ec620e2c9c90e050d5b5f78991383'
and '5480bec3f64046446cb2d5fdbba10a7a45e5d5f7'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/directfb/directfb.inc | 76 | ||||
-rw-r--r-- | packages/directfb/directfb_1.0.0.bb | 58 | ||||
-rw-r--r-- | packages/directfb/directfb_1.1.0.bb | 70 | ||||
-rw-r--r-- | packages/directfb/files/fix-pkgconfig-cflags.patch | 10 | ||||
-rw-r--r-- | packages/e17/expedite_cvs.bb | 5 | ||||
-rw-r--r-- | packages/efl1/evas.inc | 2 | ||||
-rw-r--r-- | packages/efl1/evas_cvs.bb | 2 | ||||
-rw-r--r-- | packages/linux/linux-openmoko.inc | 4 | ||||
-rw-r--r-- | packages/linux/linux_2.6.23.bb | 4 | ||||
-rw-r--r-- | packages/python/python-pydirectfb_cvs.bb | 14 | ||||
-rw-r--r-- | packages/python/python-pygtk_2.10.4.bb | 2 | ||||
-rw-r--r-- | packages/tasks/task-python-everything.bb | 3 |
12 files changed, 114 insertions, 136 deletions
diff --git a/packages/directfb/directfb.inc b/packages/directfb/directfb.inc new file mode 100644 index 0000000000..0843f36198 --- /dev/null +++ b/packages/directfb/directfb.inc @@ -0,0 +1,76 @@ +DESCRIPTION = "DirectFB is a thin library that provides developers \ +with hardware graphics acceleration, input device handling and \ +abstraction, an integrated windowing system with support for \ +translucent windows and multiple display layers on top of the \ +Linux framebuffer device." +SECTION = "libs" +LICENSE = "LGPL" +HOMEPAGE = "http://directfb.org" +DEPENDS = "jpeg libpng freetype zlib tslib" +RV = "1.0-0" +PR = "r4" + +SRC_URI = " \ + http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ + file://fix-pkgconfig-cflags.patch;patch=1 \ + file://fix-font-missing-char.patch;patch=1 \ + file://getpagesize.patch;patch=1 \ + file://fix-includes.patch;patch=1 \ + file://mkdfiff.patch;patch=1 \ +" +S = "${WORKDIR}/DirectFB-${PV}" + +LDFLAGS_append =" -lts -lm" + +inherit autotools pkgconfig + +EXTRA_OECONF = "\ + --with-gfxdrivers=none \ + --enable-libmpeg3=no \ + --enable-freetype=yes \ + --enable-sdl=no \ + --enable-vnc=no \ + --disable-x11 \ +" + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + + +#PACKAGES_DYNAMIC = "directfb-inputdrivers-*" +# +#python populate_packages_prepend () { +# import os.path +# inputdrivers_libdir = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d) +# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s') +#} + +# NOTE: monolithic packaging for now, should improve that eventually + + + +FILES_${PN}-dbg += "\ + ${libdir}/directfb-${RV}/*/*/.debug/*.so \ + ${libdir}/directfb-${RV}/*/.debug/*.so \ +" + +FILES_${PN}-dev += "\ + ${bindir}/directfb-config \ + ${libdir}/directfb-${RV}/systems/*.la \ + ${libdir}/directfb-${RV}/inputdrivers/*.la \ + ${libdir}/directfb-${RV}/interfaces/*/*.la \ + ${libdir}/directfb-${RV}/wm/*.la \ +" + +FILES_${PN} += "\ + ${libdir}/directfb-${RV}/systems/*.so \ + ${libdir}/directfb-${RV}/inputdrivers/*.so \ + ${libdir}/directfb-${RV}/interfaces/*/*.so \ + ${libdir}/directfb-${RV}/wm/*.so \ + ${datadir}/directfb-${PV} \ +" diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb index c2d249e978..5b4690fe93 100644 --- a/packages/directfb/directfb_1.0.0.bb +++ b/packages/directfb/directfb_1.0.0.bb @@ -1,56 +1,4 @@ -DESCRIPTION = "DirectFB is a thin library that provides developers \ -with hardware graphics acceleration, input device handling and \ -abstraction, an integrated windowing system with support for \ -translucent windows and multiple display layers on top of the \ -Linux framebuffer device." -SECTION = "libs" -LICENSE = "LGPL" -HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib tslib" -PR = "r5" -RV = "1.0-0" - -SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ - file://fix-pkgconfig-specs.patch;patch=1 \ - file://mkdfiff.patch;patch=1 \ - file://getpagesize.patch;patch=1 \ - file://fix-includes.patch;patch=1" -S = "${WORKDIR}/DirectFB-1.0.0" - -LDFLAGS_append =" -lts -lm" - -inherit autotools pkgconfig - -EXTRA_OECONF = "\ - --with-gfxdrivers=none \ - --enable-libmpeg3=no \ - --enable-freetype=yes \ - --enable-sdl=no \ - --enable-vnc=no \ - " - -do_stage() { - autotools_stage_all -} +require directfb.inc -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - - -FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \ - ${libdir}/directfb-${RV}/*/.debug/*.so \ -" - -FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \ - ${libdir}/directfb-${RV}/inputdrivers/*.la \ - ${libdir}/directfb-${RV}/interfaces/*/*.la \ - ${libdir}/directfb-${RV}/wm/*.la \ -" - -FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \ - ${libdir}/directfb-${RV}/inputdrivers/*.so \ - ${libdir}/directfb-${RV}/interfaces/*/*.so \ - ${libdir}/directfb-${RV}/wm/*.so \ - ${datadir}/directfb-1.0.0 \ -" +RV = "1.0-0" +PR = "r4" diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb index c3c1e66413..39002fdb5d 100644 --- a/packages/directfb/directfb_1.1.0.bb +++ b/packages/directfb/directfb_1.1.0.bb @@ -1,68 +1,4 @@ -DESCRIPTION = "DirectFB is a thin library that provides developers \ -with hardware graphics acceleration, input device handling and \ -abstraction, an integrated windowing system with support for \ -translucent windows and multiple display layers on top of the \ -Linux framebuffer device." -SECTION = "libs" -LICENSE = "LGPL" -HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib tslib" -PR = "r2" -RV = "1.1-0" - -SRC_URI = " \ - http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ - file://fix-pkgconfig-cflags.patch;patch=1 \ - file://fix-font-missing-char.patch;patch=1 \ - file://getpagesize.patch;patch=1 \ - file://fix-includes.patch;patch=1 \ - file://mkdfiff.patch;patch=1 \ - " - -S = "${WORKDIR}/DirectFB-${PV}" - -LDFLAGS_append =" -lts -lm" - -inherit autotools pkgconfig - -EXTRA_OECONF = " \ - --with-gfxdrivers=none \ - --enable-libmpeg3=no \ - --enable-freetype=yes \ - --enable-sdl=no \ - --enable-vnc=no \ - --disable-x11 \ - " - -do_stage() { - autotools_stage_all -} +require directfb.inc -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -PACKAGES_DYNAMIC = "directfb-inputdrivers-*" - -#python populate_packages_prepend () { -# import os.path -# inputdrivers_libdir = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d) -# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s') -#} -FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \ - ${libdir}/directfb-${RV}/*/.debug/*.so \ - " - -FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \ - ${libdir}/directfb-${RV}/inputdrivers/*.la \ - ${libdir}/directfb-${RV}/interfaces/*/*.la \ - ${libdir}/directfb-${RV}/wm/*.la \ - " - - -FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \ - # ${libdir}/directfb-${RV}/inputdrivers/*.so \ - # ${libdir}/directfb-${RV}/interfaces/*/*.so \ - ${libdir}/directfb-${RV}/wm/*.so \ - ${datadir}/directfb-1.1.0 \ - " +RV = "1.1-0" +PR = "r3" diff --git a/packages/directfb/files/fix-pkgconfig-cflags.patch b/packages/directfb/files/fix-pkgconfig-cflags.patch index 0273b58ec5..ddaa276fcd 100644 --- a/packages/directfb/files/fix-pkgconfig-cflags.patch +++ b/packages/directfb/files/fix-pkgconfig-cflags.patch @@ -6,7 +6,7 @@ diff -ur DirectFB-1.0.0~org/directfb-internal.pc.in DirectFB-1.0.0/directfb-inte Version: @VERSION@ Requires: directfb = @VERSION@ -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ -+Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir} ++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir} diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in --- DirectFB-1.0.0~org/directfb.pc.in 2004-08-04 12:28:20.000000000 -0400 +++ DirectFB-1.0.0/directfb.pc.in 2007-03-16 22:31:33.000000000 -0400 @@ -15,7 +15,7 @@ diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in Requires: fusion direct Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@ -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ -+Cflags: @THREADFLAGS@ -I${includedir} ++Cflags: @THREADFLAGS@ -I${includedir}/directfb -I${includedir} diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/direct.pc.in --- DirectFB-1.0.0~org/lib/direct/direct.pc.in 2005-11-23 09:18:59.000000000 -0500 +++ DirectFB-1.0.0/lib/direct/direct.pc.in 2007-03-16 22:32:13.000000000 -0400 @@ -24,7 +24,7 @@ diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/di Version: @VERSION@ Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@ -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ -+Cflags: @THREADFLAGS@ -I${includedir} ++Cflags: @THREADFLAGS@ -I${includedir}/directfb -I${includedir} diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fusion.pc.in --- DirectFB-1.0.0~org/lib/fusion/fusion.pc.in 2004-05-19 07:30:56.000000000 -0400 +++ DirectFB-1.0.0/lib/fusion/fusion.pc.in 2007-03-16 22:32:34.000000000 -0400 @@ -33,7 +33,7 @@ diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fu Requires: direct Libs: -L${libdir} -lfusion -Cflags: -I@INCLUDEDIR@ -+Cflags: -I${includedir} ++Cflags: -I${includedir}/directfb -I${includedir} diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/voodoo.pc.in --- DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in 2004-05-19 07:31:28.000000000 -0400 +++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in 2007-03-16 22:32:55.000000000 -0400 @@ -42,4 +42,4 @@ diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/vo Requires: direct Libs: -L${libdir} -lvoodoo -Cflags: -I@INCLUDEDIR@ -+Cflags: -I${includedir} ++Cflags: -I${includedir}/directfb -I${includedir} diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb index a35d3b182e..7eae0ea9a4 100644 --- a/packages/e17/expedite_cvs.bb +++ b/packages/e17/expedite_cvs.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" DEPENDS = "eet evas" +RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png" LICENSE = "MIT" -PV = "0.0.0+cvs${SRCDATE}" -PR = "r1" +PV = "0.6.0+cvs${SRCDATE}" +PR = "r0" inherit autotools diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index de3359114c..179f03b0d8 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -33,3 +33,5 @@ do_install_append() { FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la" FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" FILES_${PN} = "${libdir}/libevas*.so*" + +PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*" diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index a19a9c944b..1bacbe3d1c 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r2" +PR = "r3" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc index fc4a547fd7..d08169999c 100644 --- a/packages/linux/linux-openmoko.inc +++ b/packages/linux/linux-openmoko.inc @@ -1,8 +1,8 @@ # extra stuff we need for openmoko that is not in linux.inc do_deploy_append() { - mv ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz - mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin + mv ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz + mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin } diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index 12788473be..6a4d8ceac2 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -6,8 +6,8 @@ DEFAULT_PREFERENCE_cm-x270 = "1" DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEFAULT_PREFERENCE_mpc8323e-rdb = "1" -DEPENDS_append_mpc8313e-rdb = "dtc-native" -DEPENDS_append_mpc8323e-rdb = "dtc-native" +DEPENDS_append_mpc8313e-rdb = " dtc-native" +DEPENDS_append_mpc8323e-rdb = " dtc-native" PR = "r7" diff --git a/packages/python/python-pydirectfb_cvs.bb b/packages/python/python-pydirectfb_cvs.bb new file mode 100644 index 0000000000..cc0f3cfcd9 --- /dev/null +++ b/packages/python/python-pydirectfb_cvs.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "DirectFB Bindings" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +SRCNAME = "pydirectfb" +PV = "0.0.0+cvs${SRCDATE}" +PR = "ml0" + +SRC_URI = "cvs://anonymous@pydirectfb.cvs.sourceforge.net/cvsroot/pydirectfb;module=pydirectfb \ + file://fix-directfb-detection.patch;patch=1" +S = "${WORKDIR}/${SRCNAME}" + +inherit distutils + diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index d53e3d5105..9b4a034ffa 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python GTK+ 2.10.x Bindings" SECTION = "devel/python" # needs gtk+ 2.10.x -DEPENDS = "gtk+ libglade" +DEPENDS = "gtk+ libglade python-pycairo" RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index a1d9f444b1..c81691cd34 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,7 +1,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml21" +PR = "ml22" RDEPENDS = "\ python-ao \ @@ -9,6 +9,7 @@ RDEPENDS = "\ python-constraint \ python-dbus \ python-dialog \ + python-directfb \ python-efl \ python-pycurl \ python-fam \ |