summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2009-07-29 01:50:00 +0200
committerHenning Heinold <heinold@inf.fu-berlin.de>2009-07-29 01:50:00 +0200
commit977539b14a8aa502824ab7d6a53d6e3ade6d0e0e (patch)
treeb390444340e19a09ae385bfee39f0b4e705d6f6b /recipes
parent53131062aec4f11f45969691ad58f25ddf33fde7 (diff)
libxine: remove old/new header configure stuff from 1.1.16.3
* now buildable again * make 1.1.16.3 the default again * bump PR
Diffstat (limited to 'recipes')
-rw-r--r--recipes/libxine/libxine-1.1.16/ffmpeg_headers.patch19
-rw-r--r--recipes/libxine/libxine_1.1.16.3.bb6
2 files changed, 21 insertions, 4 deletions
diff --git a/recipes/libxine/libxine-1.1.16/ffmpeg_headers.patch b/recipes/libxine/libxine-1.1.16/ffmpeg_headers.patch
new file mode 100644
index 0000000000..be20fe6df4
--- /dev/null
+++ b/recipes/libxine/libxine-1.1.16/ffmpeg_headers.patch
@@ -0,0 +1,19 @@
+Index: xine-lib-1.1.16.3/configure.ac
+===================================================================
+--- xine-lib-1.1.16.3.orig/configure.ac 2009-07-29 01:27:23.448366991 +0200
++++ xine-lib-1.1.16.3/configure.ac 2009-07-29 01:29:12.556348147 +0200
+@@ -350,14 +350,6 @@
+ AC_SUBST([FFMPEG_POSTPROC_LIBS])
+ AC_DEFINE([HAVE_FFMPEG], [1], [Define this if you have ffmpeg library])
+
+- dnl Check presence of ffmpeg/avutil.h to see if it's old or new
+- dnl style for headers. The new style would be preferred actually...
+- AC_CHECK_HEADERS([ffmpeg/avutil.h])
+- AC_CHECK_HEADERS([libavutil/avutil.h])
+- if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then
+- AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!])
+- fi
+-
+ AC_MSG_RESULT([using external ffmpeg])
+ else
+ AC_MSG_NOTICE([
diff --git a/recipes/libxine/libxine_1.1.16.3.bb b/recipes/libxine/libxine_1.1.16.3.bb
index 1fe265e53c..1d7ccb2137 100644
--- a/recipes/libxine/libxine_1.1.16.3.bb
+++ b/recipes/libxine/libxine_1.1.16.3.bb
@@ -1,16 +1,14 @@
require libxine.inc
-#fails do_configure in minimal and angstrom
-DEFAULT_PREFERENCE = "-1"
-
PPDIR = "1.26"
-PR = "r0"
+PR = "r1"
FILESPATHPKG .= ":libxine-1.1.16"
SRC_URI += " \
file://libxine-arm-configure.patch;patch=1 \
file://iconv.patch;patch=1 \
+ file://ffmpeg_headers.patch;patch=1 \
"
python populate_packages_prepend () {