Hi, I knocked this up while doing some enterprise java installs this after
noon and Im too brain fried to deal with it and wont have time in next few
days.
So can people checkout the attached patch/improve it.
Graeme
diff --git a/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
b/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
deleted file mode 100644
index 22d30bf..0000000
--- a/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-require gtk+_${PV}.bb
-inherit native
-DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native
libx11-native"
-S = "${WORKDIR}/gtk+-${PV}"
-FILESPATH =
"${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
-SRC_URI += "file://reduce-dependencies.patch;patch=1"
-
-#clear recommends for uclibc builds
-RRECOMMENDS = " "
-RRECOMMENDS_${PN}_linux = " "
-RRECOMMENDS_${PN}_linux-gnueabi = " "
-
-EXTRA_OECONF = "\
- --with-gdktarget=x11 \
- --without-libtiff \
- --with-libjpeg \
- --with-libpng \
- --disable-cups \
-"
-
-do_compile() {
- cd gdk-pixbuf && oe_runmake
-}
-
-do_stage() {
- cd gdk-pixbuf && oe_runmake install
- find ${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
-}
-
-do_install() {
- :
-}
-
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index e6a0684..8e822b5 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -5,7 +5,7 @@ SECTION = "libs"
LICENSE = "LGPL"
PRIORITY = "optional"
DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc
libgcrypt cups \
- libxrandr libxdamage libxrender libxcomposite cairo jasper"
+ libxrandr libxdamage libxrender libxcomposite cairo jasper
gtk+-native"
PROVIDES = "gdk-pixbuf"
MAJ_VER =
"[email protected]('PV',d,1).split('.')[0]}[email protected]('PV',d,1).split('.')[1]}"
@@ -51,6 +51,7 @@ FILES_${PN}-dbg += " \
NEATSTUFF = " ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg
gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm "
RRECOMMENDS_${PN} = " ${NEATSTUFF} "
+RRECOMMENDS_${PN}_libc-uclibc = " ${NEATSTUFF} "
RRECOMMENDS_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 "
RRECOMMENDS_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1"
diff --git a/recipes/gtk+/gtk+_2.18.6.bb b/recipes/gtk+/gtk+_2.18.6.bb
index 9321b43..8546591 100644
--- a/recipes/gtk+/gtk+_2.18.6.bb
+++ b/recipes/gtk+/gtk+_2.18.6.bb
@@ -8,20 +8,14 @@ PR = "${INC_PR}.3"
BBCLASSEXTEND = "native"
DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native
libxrender-native"
+PROVIDES_virtclass-native = "gdk-pixbuf-csource-native"
# Enable xkb selectively
XKBTOGGLE = " --disable-xkb"
XKBTOGGLE_angstrom = ""
EXTRA_OECONF = "--with-libtiff ${XKBTOGGLE} --disable-glibtest
gio_can_sniff=yes"
-EXTRA_OECONF_append_virtclass-native = " --without-libtiff --without-libjpeg
--disable-modules"
-
-do_install_virtclass-native () {
- autotools_do_install
- find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
- rm ${D}${bindir}/gdk-pixbuf-csource
- echo "going native!"
-}
+EXTRA_OECONF_append_virtclass-native = " --without-libtiff --without-libjpeg"
PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-*
gtk-printbackend-*"
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
