libxine-fb 1.0: apply gcc4 patch

diff --git a/packages/libxine/libxine-x11-1.0/libxine-gcc4.patch b/packages/libxine/files/libxine-gcc4.patch
similarity index 100%
rename from packages/libxine/libxine-x11-1.0/libxine-gcc4.patch
rename to packages/libxine/files/libxine-gcc4.patch

diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb
index 668a217..62f1ac3 100644 (file)
--- a/packages/libxine/libxine-fb_1.0.bb
+++ b/packages/libxine/libxine-fb_1.0.bb
@@ -5,11 +5,11 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "zlib libogg tremor libmad libmodplug"
 PROVIDES = "virtual/libxine"
-PR = "r0"
+PR = "r1"
 
 inherit autotools pkgconfig gettext
 
-SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-${PV}.tar.gz \
        file://cpu-${PV}.patch;patch=1 \
        file://configure-${PV}.patch;patch=1 \
        file://demuxogg.patch;patch=1 \
@@ -20,7 +20,8 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.
        file://libxine-tremor-autoconf.patch;patch=1 \
        file://mpegvideo-static-inlinine.patch;patch=1 \
        file://libxine-arm-configure.patch;patch=1 \
-       file://no-caca.patch;patch=1 "
+       file://no-caca.patch;patch=1 \
+    file://libxine-gcc4.patch;patch=1"
 S = "${WORKDIR}/xine-lib-${PV}"
 
 SOV = "1.0.7"

diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb
index ea70778..03a4747 100644 (file)
--- a/packages/libxine/libxine-x11_1.0.bb
+++ b/packages/libxine/libxine-x11_1.0.bb
@@ -22,7 +22,7 @@ SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-${PV}.tar.
        file://libxine-cut-memusage.patch;patch=1 \
        file://mpegvideo-static-inlinine.patch;patch=1 \
        file://libxine-libavcodec.patch;patch=1 \
-    file://libxine-gcc4.patch;patch=1"
+       file://libxine-gcc4.patch;patch=1"
 S = "${WORKDIR}/xine-lib-${PV}"
 
 SOV = "1.0.7"