[oe-commits] Henning Heinold : libxine: update to version 1.1.19
git version control
git at git.openembedded.org
Sun Oct 10 21:44:29 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: e7632af7a47f67d9c0a1e4f37a2bb4aedae3dec0
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e7632af7a47f67d9c0a1e4f37a2bb4aedae3dec0
Author: Henning Heinold <heinold at inf.fu-berlin.de>
Date: Sun Oct 10 23:37:41 2010 +0200
libxine: update to version 1.1.19
* remove older 1.1.16 version
---
.../libxine/libxine-1.1.19/ffmpeg_headers.patch | 19 ++++++++++++++++
recipes/libxine/libxine-1.1.19/iconv.patch | 12 ++++++++++
recipes/libxine/libxine-1.1.19/ldl.patch | 23 ++++++++++++++++++++
.../libxine-1.1.19/libxine-arm-configure.patch | 18 +++++++++++++++
recipes/libxine/libxine.inc | 5 ++-
.../{libxine_1.1.16.bb => libxine_1.1.19.bb} | 12 +++++-----
6 files changed, 81 insertions(+), 8 deletions(-)
diff --git a/recipes/libxine/libxine-1.1.19/ffmpeg_headers.patch b/recipes/libxine/libxine-1.1.19/ffmpeg_headers.patch
new file mode 100644
index 0000000..be20fe6
--- /dev/null
+++ b/recipes/libxine/libxine-1.1.19/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.19/iconv.patch b/recipes/libxine/libxine-1.1.19/iconv.patch
new file mode 100644
index 0000000..d3c7cc8
--- /dev/null
+++ b/recipes/libxine/libxine-1.1.19/iconv.patch
@@ -0,0 +1,12 @@
+Index: xine-lib-1.1.15/misc/libxine.pc.in
+===================================================================
+--- xine-lib-1.1.15.orig/misc/libxine.pc.in 2008-09-19 00:50:07.144738536 +0200
++++ xine-lib-1.1.15/misc/libxine.pc.in 2008-09-19 00:50:17.962908808 +0200
+@@ -23,6 +23,6 @@
+ Version: @XINE_MAJOR at .@XINE_MINOR at .@XINE_SUB@@XINE_PATCH@
+ Requires:
+ Libs: -L${libdir} -lxine
+-Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
++Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LTLIBICONV@ @RT_LIBS@
+ Cflags: -I${includedir}
+ Cflags.private: @PTHREAD_CFLAGS@
diff --git a/recipes/libxine/libxine-1.1.19/ldl.patch b/recipes/libxine/libxine-1.1.19/ldl.patch
new file mode 100644
index 0000000..e34cab2
--- /dev/null
+++ b/recipes/libxine/libxine-1.1.19/ldl.patch
@@ -0,0 +1,23 @@
+Index: xine-lib-1.1.19/m4/dl.m4
+===================================================================
+--- xine-lib-1.1.19.orig/m4/dl.m4 2010-10-09 17:21:02.641486725 +0200
++++ xine-lib-1.1.19/m4/dl.m4 2010-10-09 17:23:32.484809340 +0200
+@@ -5,13 +5,13 @@
+ dnl
+
+ AC_DEFUN([AM_DL], [
+- AC_CHECK_LIB(c, dlopen,
+- [DYNAMIC_LD_LIBS=""
+- have_dl=yes])
++ AC_CHECK_LIB(dl, dlopen,
++ [DYNAMIC_LD_LIBS="-ldl"
++ have_dl=yes])
+
+ if test x$have_dl != "xyes"; then
+- AC_CHECK_LIB(dl, dlopen,
+- [DYNAMIC_LD_LIBS="-ldl"
++ AC_CHECK_LIB(c, dlopen,
++ [DYNAMIC_LD_LIBS=""
+ have_dl=yes])
+ fi
+
diff --git a/recipes/libxine/libxine-1.1.19/libxine-arm-configure.patch b/recipes/libxine/libxine-1.1.19/libxine-arm-configure.patch
new file mode 100644
index 0000000..6fc3bc1
--- /dev/null
+++ b/recipes/libxine/libxine-1.1.19/libxine-arm-configure.patch
@@ -0,0 +1,18 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: xine-lib-1.1.12/configure.ac
+===================================================================
+--- xine-lib-1.1.12.orig/configure.ac 2008-04-11 16:17:50.000000000 +0200
++++ xine-lib-1.1.12/configure.ac 2008-05-08 00:01:27.000000000 +0200
+@@ -2304,7 +2304,7 @@
+ alphaev56-* | alpha* | ia64-* | hppa*-linux-*)
+ AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation])
+ ;;
+- armv4l-*-linux*)
++ armv-*-linux*)
+ AC_DEFINE_UNQUOTED(FPM_ARM,,[Define to select libmad fixed point arithmetic implementation])
+ enable_armv4l="yes"
+ ;;
diff --git a/recipes/libxine/libxine.inc b/recipes/libxine/libxine.inc
index 3eeeb63..1160a80 100644
--- a/recipes/libxine/libxine.inc
+++ b/recipes/libxine/libxine.inc
@@ -3,7 +3,9 @@ SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "ffmpeg zlib libogg libvorbis tremor libmad libmodplug libpng alsa-lib virtual/libiconv virtual/libx11 \
- libxv libxext directfb pulseaudio"
+ libxv libxext directfb pulseaudio libtool"
+
+INC_PR = "r2"
inherit autotools gettext binconfig pkgconfig
@@ -24,7 +26,6 @@ EXTRA_OECONF = "--with-zlib-path=${STAGING_EXECPREFIXDIR} \
--disable-vcd \
--without-arts --without-sdl \
--disable-altivec --disable-vis --disable-mlib \
- --without-sdl \
--without-v4l --disable-dxr3 --disable-libfametest\
--disable-rpath \
--enable-fb --enable-directfb \
diff --git a/recipes/libxine/libxine_1.1.16.bb b/recipes/libxine/libxine_1.1.19.bb
similarity index 85%
rename from recipes/libxine/libxine_1.1.16.bb
rename to recipes/libxine/libxine_1.1.19.bb
index 82a1ba1..14bfdfc 100644
--- a/recipes/libxine/libxine_1.1.16.bb
+++ b/recipes/libxine/libxine_1.1.19.bb
@@ -1,14 +1,14 @@
require libxine.inc
-PPDIR = "1.25"
-PR = "r1"
+PR = ${INC_PR}.0
+PPDIR = "1.29"
SRC_URI += " \
file://libxine-arm-configure.patch \
file://iconv.patch \
- file://libpostproc.patch \
- file://libavcodec.patch \
+ file://ffmpeg_headers.patch \
+ file://ldl.patch \
"
python populate_packages_prepend () {
@@ -38,5 +38,5 @@ FILES_${PN}-dev =+ "${libdir}/xine/plugins/${PPDIR}/*.a \
${libdir}/xine/plugins/${PPDIR}/vidix/*.a \
"
-SRC_URI[md5sum] = "acd1a210c5a6444e8fd44696469352bb"
-SRC_URI[sha256sum] = "27df9c8f962797b235d69154705cfdf18d3e325f028f54e3e804f6dadb8237be"
+SRC_URI[md5sum] = "a410a0f0617e1d6309f0cbe907f73f8a"
+SRC_URI[sha256sum] = "6277c6c5343ad45027492d0b3437f1894b3d34fd9b292638da2bf4ae749d8774"
More information about the Openembedded-commits
mailing list