[PATCH 1/3] preferred-xorg-versions-X11R7.4.inc: Lock PREFERRED_VERSION_dri2proto ?= "1.1"

[PATCH 1/3] preferred-xorg-versions-X11R7.4.inc: Lock PREFERRED_VERSION_dri2proto ?= "1.1"

[Khem Raj]

* With dri2proto 2.0 recipe being added now it gets picked up
  this recipes needs newer version of xorg-utils so we tie down
  the version of dri2proto to 1.1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../include/preferred-xorg-versions-X11R7.4.inc    |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index 21f9758..156653f 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -203,6 +203,7 @@ PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
 PREFERRED_VERSION_compositeproto ?= "0.4"
 PREFERRED_VERSION_damageproto ?= "1.1.0"
 PREFERRED_VERSION_dmxproto ?= "2.2.2"
+PREFERRED_VERSION_dri2proto ?= "1.1"
 PREFERRED_VERSION_fixesproto ?= "4.0"
 PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
 PREFERRED_VERSION_fontsproto ?= "2.0.2"
-- 
1.6.3.3

[PATCH 2/3] proxy-libintl_20080418.bb: Build shared library instead of static.

[Khem Raj]

* with libint.a the link order matters and generally for uclibc
  targets we append -lintl to LDFLAGS and sometime it gets specified
  before the objects and symbols do not get pulled in. Better we
  generate shared object so the linking order does not matter

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/proxy-libintl/proxy-libintl_20080418.bb |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes/proxy-libintl/proxy-libintl_20080418.bb b/recipes/proxy-libintl/proxy-libintl_20080418.bb
index dbe7b92..6c625d6 100644
--- a/recipes/proxy-libintl/proxy-libintl_20080418.bb
+++ b/recipes/proxy-libintl/proxy-libintl_20080418.bb
@@ -5,16 +5,18 @@ LICENSE = "LGPL"
 
 PR = "r1"
 PROVIDES = "virtual/libintl"
-
+LEAD_SONAME = "libintl.so"
 
 SRC_URI = " \
     http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-${PV}.zip \
     file://stub-only.patch;patch=1 \
+    file://create-as-shared-lib.patch;patch=1 \
 "
 
 
 S = "${WORKDIR}"
-FILES_${PN}-dev = "${includedir} ${libdir}"
+FILES_${PN}-dev = "${includedir}"
+FILES_${PN} = "${libdir}/libintl.so"
 
 
 CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
@@ -32,15 +34,13 @@ do_install() {
     install -d ${D}/usr/lib
     
     install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir}
-    install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir}
+    install -m 0644 ${WORKDIR}/lib/libintl.so ${D}/${libdir}
 }
 
 
 
 do_stage() {
     install -m 0644 ${WORKDIR}/include/libintl.h ${STAGING_INCDIR}/
-    oe_libinstall -a -C lib libintl ${STAGING_LIBDIR}/
+    oe_libinstall -a -so -C lib libintl ${STAGING_LIBDIR}/
 }
 
-
-
-- 
1.6.3.3

[PATCH 3/3] minimal.conf: Set PREFERRED_VERSION of glib to 2.21.4

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/distro/minimal.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index ecf6649..4bb2738 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -106,7 +106,8 @@ require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-opie-versions-1.2.4.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
+PREFERRED_VERSION_glib-2.0-native ?= "2.21.4"
+PREFERRED_VERSION_glib-2.0 ?= "2.21.4"
 #############################################################################
 # CONTENTS
 #############################################################################
-- 
1.6.3.3

Re: [PATCH 3/3] minimal.conf: Set PREFERRED_VERSION of glib to 2.21.4

[Phil Blundell]

On Mon, 2009-09-14 at 23:41 -0700, Khem Raj wrote:
> +PREFERRED_VERSION_glib-2.0-native ?= "2.21.4"
> +PREFERRED_VERSION_glib-2.0 ?= "2.21.4"

I wonder why that version is DEFAULT_PREFERENCE -1 in the first place.
Maybe it'd be better just to change that rather than setting it for
minimal specifically.

p.

Re: [PATCH 2/3] proxy-libintl_20080418.bb: Build shared library instead of static.

[Phil Blundell]

On Mon, 2009-09-14 at 23:41 -0700, Khem Raj wrote:
> +LEAD_SONAME = "libintl.so"
>  
>  S = "${WORKDIR}"
> -FILES_${PN}-dev = "${includedir} ${libdir}"
> +FILES_${PN}-dev = "${includedir}"
> +FILES_${PN} = "${libdir}/libintl.so"

What's the reason for setting LEAD_SONAME?  It looks like it would be
unnecessary if you only have that one file in the output package.

> 
>  CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
> @@ -32,15 +34,13 @@ do_install() {
>      install -d ${D}/usr/lib
>      
>      install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir}
> -    install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir}
> +    install -m 0644 ${WORKDIR}/lib/libintl.so ${D}/${libdir}

I'd have thought you might as well continue to ship the .a file for
those who want it.  It won't do any harm since the linker will prefer
the shared object when both exist.

p.