[oe-commits] org.oe.dev directfb 1.1.0 fix pkgconfig issue at last, clean up recipe, fix packaging

[mickeyl commit]

directfb 1.1.0 fix pkgconfig issue at last, clean up recipe, fix packaging

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3354eba5d9f35da55d2e8fd5092a0e3a54670711
ViewMTN: http://monotone.openembedded.org/revision/info/3354eba5d9f35da55d2e8fd5092a0e3a54670711
Files:
1
packages/directfb/directfb_1.0.0.bb
packages/directfb/directfb_1.1.0.bb
packages/directfb/files/fix-pkgconfig-cflags.patch
Diffs:

#
# mt diff -r04e47908c9f0c587657e8e2002116fad734571d8 -r3354eba5d9f35da55d2e8fd5092a0e3a54670711
#
# 
# 
# delete "packages/directfb/directfb_1.0.0.bb"
# 
# patch "packages/directfb/directfb_1.1.0.bb"
#  from [25f7e8fa7c45ad4eea75025c5729c6e356a1be37]
#    to [9ffdd41f523263ff6a36a74bb4094f1f65d590c4]
# 
# patch "packages/directfb/files/fix-pkgconfig-cflags.patch"
#  from [b1641134828f046419d1672f3e0bfc662b78da14]
#    to [81ccc180a89e16ab87b8148e89a42d8393fad14c]
# 
============================================================
--- packages/directfb/directfb_1.1.0.bb	25f7e8fa7c45ad4eea75025c5729c6e356a1be37
+++ packages/directfb/directfb_1.1.0.bb	9ffdd41f523263ff6a36a74bb4094f1f65d590c4
@@ -7,8 +7,8 @@ DEPENDS = "jpeg libpng freetype zlib tsl
 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_${PN} += "\
+  ${libdir}/directfb-${RV}/systems/*.so \
+  ${libdir}/directfb-${RV}/inputdrivers/*.so \
+  ${libdir}/directfb-${RV}/interfaces/*/*.so \
+  ${libdir}/directfb-${RV}/wm/*.so \
+  ${datadir}/directfb-${PV} \
+"
-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 \
-			  "
============================================================
--- packages/directfb/files/fix-pkgconfig-cflags.patch	b1641134828f046419d1672f3e0bfc662b78da14
+++ packages/directfb/files/fix-pkgconfig-cflags.patch	81ccc180a89e16ab87b8148e89a42d8393fad14c
@@ -6,7 +6,7 @@ diff -ur DirectFB-1.0.0~org/directfb-int
  Version: @VERSION@
  Requires: directfb = @VERSION@
 -Cflags: @DFB_INTERNAL_CFLAGS@ -I at 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.
  Requires: fusion direct
  Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
 -Cflags: @THREADFLAGS@ -I at 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/d
  Version: @VERSION@
  Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@
 -Cflags: @THREADFLAGS@ -I at 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/f
  Requires: direct
  Libs: -L${libdir} -lfusion
 -Cflags: -I at 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/v
  Requires: direct
  Libs: -L${libdir} -lvoodoo
 -Cflags: -I at INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
-+Cflags: -I${includedir}