summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/flumotion/flumotion_0.4.1.bb2
-rw-r--r--packages/gnash/gnash-minimal.inc2
-rw-r--r--packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb2
-rw-r--r--packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb2
-rw-r--r--packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb2
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb2
-rw-r--r--packages/proxy-libintl/.mtn2git_empty0
-rw-r--r--packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty0
-rw-r--r--packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch72
-rw-r--r--packages/proxy-libintl/proxy-libintl_20080418.bb46
10 files changed, 125 insertions, 5 deletions
diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb
index 976c8c4142..c746da6c8f 100644
--- a/packages/flumotion/flumotion_0.4.1.bb
+++ b/packages/flumotion/flumotion_0.4.1.bb
@@ -1,6 +1,6 @@
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 \
diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index f77ef6ae02..a4a44ae058 100644
--- a/packages/gnash/gnash-minimal.inc
+++ b/packages/gnash/gnash-minimal.inc
@@ -1,7 +1,7 @@
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}
diff --git a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
index 3f1c0e594f..1d79379863 100644
--- a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
@@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
RCONFLICTS = "midpath-backend-qte"
inherit qt3x11
diff --git a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
index ba12796d28..f26ea4eac5 100644
--- a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
@@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
inherit qt4x11
diff --git a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
index c812b34234..6d7cb9dba7 100644
--- a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
@@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
RCONFLICTS = "midpath-backend-qt3"
inherit qt3e
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
index acbf3da7b9..e394547fd5 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
@@ -4,6 +4,8 @@ DEPENDS = "imagemagick-native librsvg-native"
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"
diff --git a/packages/proxy-libintl/.mtn2git_empty b/packages/proxy-libintl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/proxy-libintl/.mtn2git_empty
diff --git a/packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty b/packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty
diff --git a/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch b/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch
new file mode 100644
index 0000000000..7186b13c06
--- /dev/null
+++ b/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch
@@ -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))
diff --git a/packages/proxy-libintl/proxy-libintl_20080418.bb b/packages/proxy-libintl/proxy-libintl_20080418.bb
new file mode 100644
index 0000000000..dbe7b92c7e
--- /dev/null
+++ b/packages/proxy-libintl/proxy-libintl_20080418.bb
@@ -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}/
+}
+
+
+