summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-09-19 10:13:42 +0000
committerMichael Lauer <mickey@vanille-media.de>2006-09-19 10:13:42 +0000
commit72ec3275552754af9ae3ece61c2167259a1d27df (patch)
tree5662b456f450acb9f20298c39d545f0ccb918910
parent4976626e713fe0c9409826f540add706f7bdb0d2 (diff)
parent8d8d45889668f4917ebf9aced141aad0a9353df6 (diff)
merge of 0ba38ca13b8f9b76c025b96b9273d2a9d620deaa
and 33bc45d7294bae196268df2bd28ee3862534411c
-rw-r--r--packages/libxine/libxine-1.1.0/gcc41.patch13
-rw-r--r--packages/libxine/libxine_1.1.0.bb3
2 files changed, 15 insertions, 1 deletions
diff --git a/packages/libxine/libxine-1.1.0/gcc41.patch b/packages/libxine/libxine-1.1.0/gcc41.patch
new file mode 100644
index 0000000000..f201a5e38b
--- /dev/null
+++ b/packages/libxine/libxine-1.1.0/gcc41.patch
@@ -0,0 +1,13 @@
+Index: xine-lib-1.1.0/src/libffmpeg/libavcodec/mpegvideo.h
+===================================================================
+--- xine-lib-1.1.0.orig/src/libffmpeg/libavcodec/mpegvideo.h
++++ xine-lib-1.1.0/src/libffmpeg/libavcodec/mpegvideo.h
+@@ -928,7 +928,7 @@ int ff_mpeg4_get_video_packet_prefix_len
+ int ff_h263_resync(MpegEncContext *s);
+ int ff_h263_get_gob_height(MpegEncContext *s);
+ int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my);
+-int ff_h263_round_chroma(int x);
++static int ff_h263_round_chroma(int x);
+ void ff_h263_encode_motion(MpegEncContext * s, int val, int f_code);
+ int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
+
diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb
index b4ab063063..7b78d2ae51 100644
--- a/packages/libxine/libxine_1.1.0.bb
+++ b/packages/libxine/libxine_1.1.0.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng"
PROVIDES = "virtual/libxine"
-PR = "r0"
+PR = "r1"
inherit autotools pkgconfig gettext binconfig
@@ -22,6 +22,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xine/xine-lib-${PV}.tar.gz \
file://mpegvideo-static-inlinine.patch;patch=1 \
file://no-caca.patch;patch=1 \
file://dont-have-xv.patch;patch=1 \
+ file://gcc41.patch;patch=1 \
"
DEFAULT_PREFERENCE = "-1"