[oe-commits] org.oe.dev merge of '5a27dc2251870d3b0fba8216aa90a9b93350f68e'
Laibsch commit
oe at amethyst.openembedded.net
Mon Sep 1 18:14:15 UTC 2008
merge of '5a27dc2251870d3b0fba8216aa90a9b93350f68e'
and 'f94b55ab9207117d34fe0171c0ec596dc4ac85b5'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: dc62072795a21ec814639f0740549640b9b471a4
ViewMTN: http://monotone.openembedded.org/revision/info/dc62072795a21ec814639f0740549640b9b471a4
Files:
1
packages/flumotion/flumotion_0.4.1.bb
packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
packages/proxy-libintl
packages/proxy-libintl/proxy-libintl-20080418
packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch
packages/proxy-libintl/proxy-libintl_20080418.bb
packages/gnash/gnash-minimal.inc
Diffs:
#
# mt diff -r5a27dc2251870d3b0fba8216aa90a9b93350f68e -rdc62072795a21ec814639f0740549640b9b471a4
#
#
#
# patch "packages/flumotion/flumotion_0.4.1.bb"
# from [888ee41205578b445b00295429cddc535e80a0f3]
# to [9674eb392f880147b7136e7db7db37ac7e9fa7af]
#
# patch "packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb"
# from [3973ded34b696092b34b03f4883501088965b583]
# to [d52dd9d399e3ae8b6c66f999229e5f797d319665]
#
# patch "packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb"
# from [b41941b0d420980c4211a1fa04fd53db33d07f92]
# to [098380e73ab98a0ac07f4437a937edd32324eea7]
#
# patch "packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb"
# from [966b5d88b9928c4b7654a06ca0c5250612b72485]
# to [0dd83a30378cbd321e2891c6fdce475de1149853]
#
# patch "packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb"
# from [3c5864ec8c49138cc893c47ab0e73877b04d0783]
# to [458508adc8e06b4cf1c7cf861dfebd603b5f58c8]
#
============================================================
--- packages/flumotion/flumotion_0.4.1.bb 888ee41205578b445b00295429cddc535e80a0f3
+++ packages/flumotion/flumotion_0.4.1.bb 9674eb392f880147b7136e7db7db37ac7e9fa7af
@@ -1,6 +1,6 @@ LICENSE = "GPL"
DESCRIPTION = "Fluendo Streaming Server"
LICENSE = "GPL"
-DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk"
+DEPENDS = "gstreamer python-imaging python-gst python-twisted python-pygtk"
RDEPENDS = "python-resource python-pprint python-threading \
python-imaging python-xml python-curses \
python-compression python-fcntl python-pygobject \
============================================================
--- packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb 3973ded34b696092b34b03f4883501088965b583
+++ packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb d52dd9d399e3ae8b6c66f999229e5f797d319665
@@ -6,7 +6,7 @@ S = "${WORKDIR}/midpath-0.3rc1"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
RCONFLICTS = "midpath-backend-qte"
inherit qt3x11
============================================================
--- packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b41941b0d420980c4211a1fa04fd53db33d07f92
+++ packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb 098380e73ab98a0ac07f4437a937edd32324eea7
@@ -6,7 +6,7 @@ S = "${WORKDIR}/midpath-0.3rc1"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
inherit qt4x11
============================================================
--- packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb 966b5d88b9928c4b7654a06ca0c5250612b72485
+++ packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb 0dd83a30378cbd321e2891c6fdce475de1149853
@@ -6,7 +6,7 @@ S = "${WORKDIR}/midpath-0.3rc1"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
RCONFLICTS = "midpath-backend-qt3"
inherit qt3e
============================================================
--- packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb 3c5864ec8c49138cc893c47ab0e73877b04d0783
+++ packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb 458508adc8e06b4cf1c7cf861dfebd603b5f58c8
@@ -4,6 +4,8 @@ PR = "r2"
PV = "0.1.0+svnr${SRCREV}"
PR = "r2"
+EXCLUDE_FROM_WORLD = "1"
+
inherit openmoko2
SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
#
# mt diff -rf94b55ab9207117d34fe0171c0ec596dc4ac85b5 -rdc62072795a21ec814639f0740549640b9b471a4
#
#
#
# add_dir "packages/proxy-libintl"
#
# add_dir "packages/proxy-libintl/proxy-libintl-20080418"
#
# add_file "packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch"
# content [cd5a6eadb3df3174fd8fb17a1a794e0f11573a03]
#
# add_file "packages/proxy-libintl/proxy-libintl_20080418.bb"
# content [5f098356ea6c56a4a64655b7ed87cc62a7afed12]
#
# patch "packages/gnash/gnash-minimal.inc"
# from [8dabbe35069c1d216e834268bca9dfc522bdea92]
# to [1d97af65dabb8f2af969bd858ef3578a722d92d2]
#
============================================================
--- packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch cd5a6eadb3df3174fd8fb17a1a794e0f11573a03
+++ packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch cd5a6eadb3df3174fd8fb17a1a794e0f11573a03
@@ -0,0 +1,72 @@
+Index: proxy-libintl/src/proxy-libintl/libintl.c
+===================================================================
+--- proxy-libintl.orig/src/proxy-libintl/libintl.c
++++ proxy-libintl/src/proxy-libintl/libintl.c
+@@ -18,9 +18,12 @@
+ */
+
+ #ifdef _WIN32
+-#include <windows.h>
++# include <windows.h>
+ #else
+-#include <dlfcn.h>
++# include <stddef.h>
++# if !STUB_ONLY
++# include <dlfcn.h>
++# endif
+ typedef void* HMODULE;
+ #endif
+
+@@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese
+ static int
+ use_intl_dll (HMODULE dll)
+ {
+-#ifdef _WIN32
+-#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
+-#else
+-#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
+-#endif
++#if !STUB_ONLY
++# ifdef _WIN32
++# define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
++# else
++# define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
++# endif /* _WIN32 */
++
+
+ LOOKUP (gettext);
+ LOOKUP (dgettext);
+@@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll)
+ LOOKUP (bind_textdomain_codeset);
+
+ #undef LOOKUP
+-
++#endif /* !STUB_ONLY */
+ return 1;
+ }
+
+@@ -171,13 +176,17 @@ setup (void)
+
+ if (!beenhere)
+ {
+-#ifdef _WIN32
+- HMODULE intl_dll = LoadLibrary ("intl.dll");
+-#elif defined(__APPLE__) && defined(__MACH__)
+- HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
+-#else
+- HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
+-#endif
++#if !STUB_ONLY
++# ifdef _WIN32
++ HMODULE intl_dll = LoadLibrary ("intl.dll");
++# elif defined(__APPLE__) && defined(__MACH__)
++ HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
++# else
++ HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
++# endif
++#else /* !STUB_ONLY */
++ HMODULE intl_dll = NULL;
++#endif /* STUB_ONLY */
+
+ if (intl_dll != NULL &&
+ use_intl_dll (intl_dll))
============================================================
--- packages/proxy-libintl/proxy-libintl_20080418.bb 5f098356ea6c56a4a64655b7ed87cc62a7afed12
+++ packages/proxy-libintl/proxy-libintl_20080418.bb 5f098356ea6c56a4a64655b7ed87cc62a7afed12
@@ -0,0 +1,46 @@
+DESCRIPTION = "Proxy libintl"
+HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+PR = "r1"
+PROVIDES = "virtual/libintl"
+
+
+SRC_URI = " \
+ http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-${PV}.zip \
+ file://stub-only.patch;patch=1 \
+"
+
+
+S = "${WORKDIR}"
+FILES_${PN}-dev = "${includedir} ${libdir}"
+
+
+CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
+
+do_compile() {
+ cd ${WORKDIR}/src/proxy-libintl
+ oe_runmake
+}
+
+
+
+
+do_install() {
+ install -d ${D}/usr/include
+ install -d ${D}/usr/lib
+
+ install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir}
+ install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir}
+}
+
+
+
+do_stage() {
+ install -m 0644 ${WORKDIR}/include/libintl.h ${STAGING_INCDIR}/
+ oe_libinstall -a -C lib libintl ${STAGING_LIBDIR}/
+}
+
+
+
============================================================
--- packages/gnash/gnash-minimal.inc 8dabbe35069c1d216e834268bca9dfc522bdea92
+++ packages/gnash/gnash-minimal.inc 1d97af65dabb8f2af969bd858ef3578a722d92d2
@@ -1,7 +1,7 @@ LICENSE = "GPL-2"
DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
HOMEPAGE = "http://www.gnu.org/software/gnash"
LICENSE = "GPL-2"
-DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
+DEPENDS = "virtual/libiconv virtual/libintl libltdl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
S = ${WORKDIR}/gnash-${PV}
More information about the Openembedded-commits
mailing list