diff options
author | Michael Lauer <mickey@vanille-media.de> | 2007-12-10 19:50:57 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2007-12-10 19:50:57 +0000 |
commit | 7dd2b725aefc48f89c4acc3ec268460cefc0661f (patch) | |
tree | b7ea399df020c8c08fb2acf10e24615c3cd59aa9 /packages | |
parent | c8426ed007a275b1e77c9db80fdac06cb005e0ae (diff) |
directfb 1.1.0 fix pkgconfig issue at last, clean up recipe, fix packaging
Diffstat (limited to 'packages')
-rw-r--r-- | packages/directfb/directfb_1.0.0.bb | 56 | ||||
-rw-r--r-- | packages/directfb/directfb_1.1.0.bb | 66 | ||||
-rw-r--r-- | packages/directfb/files/fix-pkgconfig-cflags.patch | 10 |
3 files changed, 42 insertions, 90 deletions
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb deleted file mode 100644 index c2d249e978..0000000000 --- a/packages/directfb/directfb_1.0.0.bb +++ /dev/null @@ -1,56 +0,0 @@ -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 -} - -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 \ -" diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb index c3c1e66413..8fe4fd418a 100644 --- a/packages/directfb/directfb_1.1.0.bb +++ b/packages/directfb/directfb_1.1.0.bb @@ -7,8 +7,8 @@ SECTION = "libs" LICENSE = "LGPL" HOMEPAGE = "http://directfb.org" DEPENDS = "jpeg libpng freetype zlib tslib" -PR = "r2" RV = "1.1-0" +PR = "r3" SRC_URI = " \ http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ @@ -17,22 +17,21 @@ SRC_URI = " \ 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 \ - " +EXTRA_OECONF = "\ + --with-gfxdrivers=none \ + --enable-libmpeg3=no \ + --enable-freetype=yes \ + --enable-sdl=no \ + --enable-vnc=no \ + --disable-x11 \ +" do_stage() { autotools_stage_all @@ -42,27 +41,36 @@ do_install() { oe_runmake 'DESTDIR=${D}' install } -PACKAGES_DYNAMIC = "directfb-inputdrivers-*" +#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') +# 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 \ - " +# 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_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 \ - " +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/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} |