[oe-commits] org.oe.dev merge of '664c903716e2388f94905f48588afd5542b78fc6'

[oe commit]

merge of '664c903716e2388f94905f48588afd5542b78fc6'
     and '7f8cad96c8dde93c85aa34ce420a3a852cbdf6ad'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 0783f8f37971088f86b67e5e20e78ed834d4df1f
ViewMTN: http://monotone.openembedded.org/revision/info/0783f8f37971088f86b67e5e20e78ed834d4df1f
Files:
1
packages/gdb/gdb-cross_6.7.1.bb
packages/gdb/gdb_6.7.1.bb
packages/gdb/gdb.inc
packages/gnash/gnash-minimal.inc
packages/libxcomp
packages/libxcomp/files
packages/libxcomp/files/sa_restorer.patch
packages/libxcomp/libxcomp_3.2.0-7.bb
Diffs:

#
# mt diff -r664c903716e2388f94905f48588afd5542b78fc6 -r0783f8f37971088f86b67e5e20e78ed834d4df1f
#
#
#
# add_file "packages/gdb/gdb-cross_6.7.1.bb"
#  content [67cdcc53ad922e364adeb1fc3718249b2beb42e6]
# 
# add_file "packages/gdb/gdb_6.7.1.bb"
#  content [1974ad29cb92afcf98eb51bfe28e85828e6ac653]
# 
# patch "packages/gdb/gdb.inc"
#  from [d38ac31ee4064d23295f055b62386aedf580e1f7]
#    to [f6bb150bab8fd7587c63aa3cf225c0c8bd39c770]
# 
# patch "packages/gnash/gnash-minimal.inc"
#  from [eb90fecce11dc84a53c51d06768ca881e6c1bfd1]
#    to [5f723da77ef0cf703b69d865c055faf8cef819d3]
#
============================================================
--- packages/gdb/gdb-cross_6.7.1.bb	67cdcc53ad922e364adeb1fc3718249b2beb42e6
+++ packages/gdb/gdb-cross_6.7.1.bb	67cdcc53ad922e364adeb1fc3718249b2beb42e6
@@ -0,0 +1,19 @@
+require gdb-cross.inc
+inherit cross
+
+DEFAULT_PREFERENCE_avr32 = "99"
+SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2"
+S_avr32 = "${WORKDIR}/gdb-6.7.1.atmel.1.0.3"
+
+do_configure_prepend() {
+    for i in $(find ${S} -name "warning*m4") ; do
+        sed -i -e s:-Werror::g $i
+    done
+    for i in $(find ${S} -name "configure.ac") ; do
+        sed -i -e s:-Werror::g $i
+    done
+    for i in $(find ${S} -name "configure") ; do
+        sed -i -e s:-Werror::g $i
+    done
+}
+
============================================================
--- packages/gdb/gdb_6.7.1.bb	1974ad29cb92afcf98eb51bfe28e85828e6ac653
+++ packages/gdb/gdb_6.7.1.bb	1974ad29cb92afcf98eb51bfe28e85828e6ac653
@@ -0,0 +1,5 @@
+require gdb.inc
+
+DEFAULT_PREFERENCE_avr32 = "99"
+SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2"
+S_avr32 = "${WORKDIR}/gdb-6.7.1.atmel.1.0.3"
============================================================
--- packages/gdb/gdb.inc	d38ac31ee4064d23295f055b62386aedf580e1f7
+++ packages/gdb/gdb.inc	f6bb150bab8fd7587c63aa3cf225c0c8bd39c770
@@ -1,5 +1,7 @@ require gdb-common.inc
 require gdb-common.inc
 
+DEFAULT_PREFERENCE_avr32 = "-99"
+
 DEPENDS = "ncurses readline"
 
 PACKAGES =+ "gdbserver"
============================================================
--- packages/gnash/gnash-minimal.inc	eb90fecce11dc84a53c51d06768ca881e6c1bfd1
+++ packages/gnash/gnash-minimal.inc	5f723da77ef0cf703b69d865c055faf8cef819d3
@@ -3,6 +3,7 @@ DEPENDS = "virtual/libiconv virtual/libi
 LICENSE = "GPL-2"
 
 DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
+RRECOMMENDS_${PN} = "libltdl"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
 S = ${WORKDIR}/gnash-${PV}
@@ -49,10 +50,11 @@ PACKAGES =+ "libgnashnet libgnashamf lib
 
 PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia"
 
+FILES_${PN} += "${datadir}/gnash/*png ${datadir}/gnash/*ico"
 FILES_${PN}-dbg += "${libdir}/gnash/.debug"
 FILES_${PN}-dev += "${libdir}/gnash/*a"
-FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so"
-FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so"
-FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so"
-FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so"
+FILES_libgnashamf = "${libdir}/gnash/libgnashamf-*.so"
+FILES_libgnashbase = "${libdir}/gnash/libgnashbase-*.so"
+FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-*.so"
+FILES_libgnashserver = "${libdir}/gnash/libgnashserver-*.so"
 FILES_libgnashnet = "${libdir}/gnash/libgnashnet.so.*"


#
# mt diff -r7f8cad96c8dde93c85aa34ce420a3a852cbdf6ad -r0783f8f37971088f86b67e5e20e78ed834d4df1f
#
#
#
# add_dir "packages/libxcomp"
# 
# add_dir "packages/libxcomp/files"
# 
# add_file "packages/libxcomp/files/sa_restorer.patch"
#  content [c2d3d7ebc78ff4859c5397d5432aa21856730963]
# 
# add_file "packages/libxcomp/libxcomp_3.2.0-7.bb"
#  content [f50cb11b6f763080d8d92dcdc153451d242b21d3]
#
============================================================
--- packages/libxcomp/files/sa_restorer.patch	c2d3d7ebc78ff4859c5397d5432aa21856730963
+++ packages/libxcomp/files/sa_restorer.patch	c2d3d7ebc78ff4859c5397d5432aa21856730963
@@ -0,0 +1,25 @@
+Patch taken from the debian unstable package
+
+
+Index: nxcomp/Loop.cpp
+===================================================================
+--- nxcomp/Loop.cpp	2008-06-16 18:49:56.330011773 +0100
++++ nxcomp/Loop.cpp	2008-06-16 18:50:18.093320515 +0100
+@@ -5888,7 +5888,7 @@
+ 
+   #if defined(__linux__)
+ 
+-  newAction.sa_restorer = NULL;
++  memset(&newAction, NULL, sizeof(newAction));
+ 
+   #endif
+ 
+@@ -6506,7 +6506,7 @@
+ 
+   #if defined(__linux__)
+ 
+-  action.sa_restorer = NULL;
++  memset(&action, NULL, sizeof(action));
+ 
+   #endif
+ 
============================================================
--- packages/libxcomp/libxcomp_3.2.0-7.bb	f50cb11b6f763080d8d92dcdc153451d242b21d3
+++ packages/libxcomp/libxcomp_3.2.0-7.bb	f50cb11b6f763080d8d92dcdc153451d242b21d3
@@ -0,0 +1,28 @@
+DESCRIPTION = "Compression library for x-protocol from nomachine"
+HOMEPAGE = "http://www.nomachine.com/"
+SECTION = "libs"
+LICENSE = "GPL"
+PR = "r0"
+
+DEPENDS = "virtual/libx11 zlib jpeg libpng"
+
+SRC_URI = "http://64.34.161.181/download/3.2.0/sources/nxcomp-${PV}.tar.gz \
+	   file://sa_restorer.patch;patch=1 \
+	  "
+
+          
+inherit autotools
+
+S = "${WORKDIR}/nxcomp"
+
+do_install () {
+       oe_libinstall -a -so libXcomp ${D}${libdir}
+       install -d ${D}${includedir}/
+       install -m 0644 NX.h ${D}${includedir}/
+}
+
+
+do_stage () {
+       oe_libinstall -a -so libXcomp ${STAGING_LIBDIR}
+       install -m 0644 NX.h ${STAGING_INCDIR}/ 
+}