diff options
author | Henning Heinold <h.heinold@tarent.de> | 2011-02-08 18:06:40 +0100 |
---|---|---|
committer | Henning Heinold <h.heinold@tarent.de> | 2011-02-08 18:09:43 +0100 |
commit | f26754d6bcb5a10f304f8860e57f6a8c8b4fc725 (patch) | |
tree | 8aa317da0c9f3cfd963e3742fde6d53f3e70f546 /recipes/directfb | |
parent | 0bf03ff7ee9bb145c3eb5c2602dc7acd6fe2880c (diff) | |
download | openembedded-f26754d6bcb5a10f304f8860e57f6a8c8b4fc725.tar.gz |
directfb: update directfb 1.4 to directfb 1.4.11 and switch to INC_PR support
* remove directfb < 1.2 stuff from .inc file
* bump PR through INC_PR support
Diffstat (limited to 'recipes/directfb')
-rw-r--r-- | recipes/directfb/directfb-1.4.11/mkdfiff.patch (renamed from recipes/directfb/directfb-1.4.6/mkdfiff.patch) | 0 | ||||
-rw-r--r-- | recipes/directfb/directfb.inc | 25 | ||||
-rw-r--r-- | recipes/directfb/directfb_1.2.8.bb | 3 | ||||
-rw-r--r-- | recipes/directfb/directfb_1.4.11.bb | 19 | ||||
-rw-r--r-- | recipes/directfb/directfb_1.4.6.bb | 27 | ||||
-rw-r--r-- | recipes/directfb/files/fix-pkgconfig-cflags.patch | 55 |
6 files changed, 57 insertions, 72 deletions
diff --git a/recipes/directfb/directfb-1.4.6/mkdfiff.patch b/recipes/directfb/directfb-1.4.11/mkdfiff.patch index 28bd534f37..28bd534f37 100644 --- a/recipes/directfb/directfb-1.4.6/mkdfiff.patch +++ b/recipes/directfb/directfb-1.4.11/mkdfiff.patch diff --git a/recipes/directfb/directfb.inc b/recipes/directfb/directfb.inc index d07d58c113..baaffa194e 100644 --- a/recipes/directfb/directfb.inc +++ b/recipes/directfb/directfb.inc @@ -6,37 +6,26 @@ Linux framebuffer device." SECTION = "libs" LICENSE = "LGPL" HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib tslib" +DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils" + +INC_PR = "r1" -SRC_URI = " \ - http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \ - file://fix-pkgconfig-cflags.patch \ - file://fix-font-missing-char.patch \ - file://getpagesize.patch \ - file://mkdfiff.patch \ - file://dont-use-linux-config.patch \ - file://ts_lib_autotools.patch \ -" S = "${WORKDIR}/DirectFB-${PV}" -LDFLAGS_append =" -lts -lm" +#LDFLAGS_append =" -lts -lm" inherit autotools binconfig pkgconfig EXTRA_OECONF = "\ + --enable-freetype=yes \ + --enable-zlib \ --with-gfxdrivers=none \ --enable-libmpeg3=no \ - --enable-freetype=yes \ --enable-sdl=no \ --enable-vnc=no \ --disable-x11 \ " -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - - #PACKAGES_DYNAMIC = "directfb-inputdrivers-*" # #python populate_packages_prepend () { @@ -47,8 +36,6 @@ do_install() { # NOTE: monolithic packaging for now, should improve that eventually - - FILES_${PN}-dbg += "\ ${libdir}/directfb-${RV}/*/*/.debug/*.so \ ${libdir}/directfb-${RV}/*/.debug/*.so \ diff --git a/recipes/directfb/directfb_1.2.8.bb b/recipes/directfb/directfb_1.2.8.bb index a6cf68ff3b..41db8c29eb 100644 --- a/recipes/directfb/directfb_1.2.8.bb +++ b/recipes/directfb/directfb_1.2.8.bb @@ -1,10 +1,11 @@ require directfb.inc RV = "1.2-0" +PR = "${INC_PR}.0" DEPENDS += "sysfsutils" -SRC_URI = " \ +SRC_URI += " \ http://directfb.org/downloads/Core/DirectFB-1.2/DirectFB-${PV}.tar.gz \ file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ file://mkdfiff.patch \ diff --git a/recipes/directfb/directfb_1.4.11.bb b/recipes/directfb/directfb_1.4.11.bb new file mode 100644 index 0000000000..febc58417e --- /dev/null +++ b/recipes/directfb/directfb_1.4.11.bb @@ -0,0 +1,19 @@ +require directfb.inc + +RV = "1.4-5" +PR = "${INC_PR}.0" + +DEPENDS += "sysfsutils" + +SRC_URI = " \ + http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \ + file://fix-pkgconfig-cflags.patch \ + file://mkdfiff.patch \ + file://dont-use-linux-config.patch \ + " + +LEAD_SONAME = "libdirectfb-1.4.so.5" + +SRC_URI[md5sum] = "94735ccec21120794adcce93a61445d2" +SRC_URI[sha256sum] = "85e27aa6ab9e784689a803961724eb5674cb9f5153770e63f02bf3f75a573a02" + diff --git a/recipes/directfb/directfb_1.4.6.bb b/recipes/directfb/directfb_1.4.6.bb deleted file mode 100644 index 70c0225bf7..0000000000 --- a/recipes/directfb/directfb_1.4.6.bb +++ /dev/null @@ -1,27 +0,0 @@ -require directfb.inc - -RV = "1.4-5" -PR = "r2" - -DEPENDS += "sysfsutils" - -SRC_URI = " \ - http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \ - file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ - file://mkdfiff.patch \ - file://dont-use-linux-config.patch \ - " - -EXTRA_OECONF = "\ - --enable-freetype=yes \ - --enable-zlib \ - --with-gfxdrivers=none \ - --disable-sdl \ - --disable-vnc \ - --disable-x11 \ -" - -LEAD_SONAME = "libdirectfb-1.4.so.5" - -SRC_URI[md5sum] = "dbe1957932f81790742b58b94c1c7b84" -SRC_URI[sha256sum] = "b18121e60e9a084ee347037a53a46cfaea1c09505bd99d673c2e65eca285e69b" diff --git a/recipes/directfb/files/fix-pkgconfig-cflags.patch b/recipes/directfb/files/fix-pkgconfig-cflags.patch index ddaa276fcd..86d9964819 100644 --- a/recipes/directfb/files/fix-pkgconfig-cflags.patch +++ b/recipes/directfb/files/fix-pkgconfig-cflags.patch @@ -1,45 +1,50 @@ -diff -ur DirectFB-1.0.0~org/directfb-internal.pc.in DirectFB-1.0.0/directfb-internal.pc.in ---- DirectFB-1.0.0~org/directfb-internal.pc.in 2003-07-04 13:30:22.000000000 -0400 -+++ DirectFB-1.0.0/directfb-internal.pc.in 2007-03-16 22:34:17.000000000 -0400 +Index: DirectFB-1.4.11/directfb-internal.pc.in +=================================================================== +--- DirectFB-1.4.11.orig/directfb-internal.pc.in 2010-10-08 14:43:46.000000000 +0200 ++++ DirectFB-1.4.11/directfb-internal.pc.in 2011-02-08 15:02:50.556167491 +0100 @@ -8,4 +8,4 @@ Description: Third party module support package for DirectFB. Version: @VERSION@ Requires: directfb = @VERSION@ -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ +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 -@@ -8,4 +8,4 @@ - Version: @VERSION@ - Requires: fusion direct - Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@ --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 -@@ -7,4 +7,4 @@ - Description: DirectFB base development library +Index: DirectFB-1.4.11/lib/direct/direct.pc.in +=================================================================== +--- DirectFB-1.4.11.orig/lib/direct/direct.pc.in 2010-10-08 14:43:46.000000000 +0200 ++++ DirectFB-1.4.11/lib/direct/direct.pc.in 2011-02-08 15:03:53.676167612 +0100 +@@ -10,4 +10,4 @@ Version: @VERSION@ - Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@ + Libs: -L${libdir} -ldirect @THREADLIB@ + Libs.private: -L${libdir} @DYNLIB@ -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 ++@THREADFLAGS@ -I${includedir}/directfb -I${includedir} +Index: DirectFB-1.4.11/lib/fusion/fusion.pc.in +=================================================================== +--- DirectFB-1.4.11.orig/lib/fusion/fusion.pc.in 2010-10-08 14:43:46.000000000 +0200 ++++ DirectFB-1.4.11/lib/fusion/fusion.pc.in 2011-02-08 15:02:50.556167491 +0100 @@ -8,4 +8,4 @@ Version: @VERSION@ Requires: direct Libs: -L${libdir} -lfusion -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 +Index: DirectFB-1.4.11/lib/voodoo/voodoo.pc.in +=================================================================== +--- DirectFB-1.4.11.orig/lib/voodoo/voodoo.pc.in 2010-10-08 14:43:46.000000000 +0200 ++++ DirectFB-1.4.11/lib/voodoo/voodoo.pc.in 2011-02-08 15:02:50.576167451 +0100 @@ -8,4 +8,4 @@ Version: @VERSION@ Requires: direct Libs: -L${libdir} -lvoodoo -Cflags: -I@INCLUDEDIR@ +Cflags: -I${includedir}/directfb -I${includedir} +Index: DirectFB-1.4.11/directfb.pc.in +=================================================================== +--- DirectFB-1.4.11.orig/directfb.pc.in 2010-11-15 22:13:59.000000000 +0100 ++++ DirectFB-1.4.11/directfb.pc.in 2011-02-08 15:04:41.796167163 +0100 +@@ -9,4 +9,4 @@ + Requires: @DEP_VOODOO@ fusion direct + Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@ + Libs.private: -L${libdir} @MEDIALIB@ @DYNLIB@ @ZLIB_LIBS@ +-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ ++Cflags: @THREADFLAGS@ -I${includedir}/directfb -I${includedir} |