Mercurial > mxe-octave

changeset 2583:c4cd2fe180e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package xine-lib
author Mark Brand <mabrand@mabrand.nl>
date Tue, 12 Jun 2012 23:07:46 +0200
parents b13e1e1e5284
children 8ee32fa10c89
files index.html src/xine-lib-1-fixes.patch src/xine-lib.mk
diffstat 3 files changed, 39 insertions(+), 99 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Tue Jun 12 23:37:49 2012 +0200
+++ b/index.html	Tue Jun 12 23:07:46 2012 +0200
@@ -1920,7 +1920,7 @@
     </tr>
     <tr>
         <td id="xine-lib-package">xine-lib</td>
-        <td id="xine-lib-version">1.1.20.1</td>
+        <td id="xine-lib-version">1.1.21</td>
         <td id="xine-lib-website"><a href="http://www.xine-project.org/">xine-lib</a></td>
     </tr>
     <tr>
--- a/src/xine-lib-1-fixes.patch	Tue Jun 12 23:37:49 2012 +0200
+++ b/src/xine-lib-1-fixes.patch	Tue Jun 12 23:07:46 2012 +0200
@@ -1,60 +1,10 @@
 This file is part of MXE.
 See index.html for further information.
 
-Contains ad hoc patches for cross building.
-
-From d8274b609ad0b0dd56a6b64b60dad9bff960dd8c Mon Sep 17 00:00:00 2001
-From: "mxe@mxe.cc" <mxe@mxe.cc>
-Date: Sun, 13 Nov 2011 11:48:07 +0100
-Subject: [PATCH 1/5] fix-install-def-file
-
----
- src/xine-engine/Makefile.am |    4 ++--
- src/xine-engine/Makefile.in |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
-index 67ae63f..0f94abf 100644
---- a/src/xine-engine/Makefile.am
-+++ b/src/xine-engine/Makefile.am
-@@ -45,10 +45,10 @@ noinst_HEADERS = bswap.h ffmpeg_bswap.h xine_private.h
- 
- if WIN32
- install-exec-local:
--	cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
-+	-cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
- 
- uninstall-local:
--	rm -f $(DEF_FILE)
-+	-rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
- endif
- 
- $(XINEUTILS_LIB):
-diff --git a/src/xine-engine/Makefile.in b/src/xine-engine/Makefile.in
-index 167a32b..0664e1f 100644
---- a/src/xine-engine/Makefile.in
-+++ b/src/xine-engine/Makefile.in
-@@ -905,10 +905,10 @@ $(LIBXINEPOSIX):
- 	$(MAKE) -C $(top_builddir)/lib libxineposix.la
- 
- @WIN32_TRUE@install-exec-local:
--@WIN32_TRUE@	cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
-+@WIN32_TRUE@	-cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
- 
- @WIN32_TRUE@uninstall-local:
--@WIN32_TRUE@	rm -f $(DEF_FILE)
-+@WIN32_TRUE@	-rm -f $(DESTDIR)$(libdir)/$(DEF_FILE)
- 
- $(XINEUTILS_LIB):
- 	$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
--- 
-1.7.9.2
-
-
-From 939df00f8c1dfa7d138eddb19735d2ea826826fb Mon Sep 17 00:00:00 2001
+From 6dc46ed1253c1fce1cfa8d360e352b5bc12d0d3b Mon Sep 17 00:00:00 2001
 From: "mxe@mxe.cc" <mxe@mxe.cc>
 Date: Sun, 13 Nov 2011 12:05:22 +0100
-Subject: [PATCH 2/5] fake missing definitions for WIN32
+Subject: [PATCH 1/4] fake missing definitions for WIN32
 
 Taken from:
 https://bugs.xine-project.org/show_bug.cgi?id=433
@@ -63,7 +13,7 @@
  1 file changed, 12 insertions(+)
 
 diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
-index 802461e..8b9b704 100644
+index bc40d4e..a613a89 100644
 --- a/src/audio_out/audio_file_out.c
 +++ b/src/audio_out/audio_file_out.c
 @@ -53,6 +53,18 @@
@@ -86,20 +36,20 @@
  
  struct wavhdr {
 -- 
-1.7.9.2
+1.7.10.4
 
 
-From 6cd583034929bcdd0e3fa0424b4d4e026ef87728 Mon Sep 17 00:00:00 2001
+From 4a7cd803cbc3daa3f19fdc6b34fb93e1994bc2f5 Mon Sep 17 00:00:00 2001
 From: "mxe@mxe.cc" <mxe@mxe.cc>
 Date: Sun, 13 Nov 2011 13:45:21 +0100
-Subject: [PATCH 3/5] force graphicsmagick over imagemagick
+Subject: [PATCH 2/4] force graphicsmagick over imagemagick
 
 ---
  configure.ac |    9 ---------
  1 file changed, 9 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index b175301..d37ba36 100644
+index 9112b58..67f1147 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1412,14 +1412,6 @@ AC_ARG_WITH([imagemagick],
@@ -126,48 +76,13 @@
        AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found])
     elif test "x$have_imagemagick" = "xyes"; then
 -- 
-1.7.9.2
+1.7.10.4
 
 
-From 7b7304ef66f91f6f9d94a84f38b70c4d13935f93 Mon Sep 17 00:00:00 2001
-From: "mxe@mxe.cc" <mxe@mxe.cc>
-Date: Mon, 30 Jan 2012 09:21:33 +0100
-Subject: [PATCH 4/5] zlib 1.2.6 compatibility
-
----
- src/xine-engine/osd.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
-index 1d22ea3..0fbde93 100644
---- a/src/xine-engine/osd.c
-+++ b/src/xine-engine/osd.c
-@@ -650,7 +650,7 @@ static void osd_set_position (osd_object_t *osd, int x, int y) {
-   osd->display_y = y;
- }
- 
--static uint16_t gzread_i16(gzFile *fp) {
-+static uint16_t gzread_i16(gzFile fp) {
-   uint16_t ret;
-   ret = gzgetc(fp);
-   ret |= (gzgetc(fp)<<8);
-@@ -663,7 +663,7 @@ static uint16_t gzread_i16(gzFile *fp) {
- 
- static int osd_renderer_load_font(osd_renderer_t *this, char *filename) {
- 
--  gzFile      *fp;
-+  gzFile      fp;
-   osd_font_t  *font = NULL;
-   int          i, ret = 0;
- 
--- 
-1.7.9.2
-
-
-From 1a39e224fae0895f964e7c1ba1f1a77b4cd0492d Mon Sep 17 00:00:00 2001
+From 5b362f4aed3a814a351cd259efb62b40761ddb3d Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sun, 27 May 2012 23:28:57 +0200
-Subject: [PATCH 5/5] add missing localtime_r
+Subject: [PATCH 3/4] add missing localtime_r
 
 Previously provided by pthreads-w32-2-8-0-release, which is also
 the source of this version.
@@ -199,5 +114,30 @@
  static void XINE_FORMAT_PRINTF(2, 0)
    scratch_printf (scratch_buffer_t *this, const char *format, va_list argp)
 -- 
-1.7.9.2
+1.7.10.4
+
+
+From 0d3546c3c12a8bf311c9751f0d0d2e3a95569657 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sun, 27 May 2012 23:23:19 +0200
+Subject: [PATCH 4/4] ffmpeg 0.11 removed avcodec_init
+
+---
+ src/combined/ffmpeg/ffmpeg_decoder.c |    1 -
+ 1 file changed, 1 deletion(-)
 
+diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c
+index 879df53..84ee1a3 100644
+--- a/src/combined/ffmpeg/ffmpeg_decoder.c
++++ b/src/combined/ffmpeg/ffmpeg_decoder.c
+@@ -312,7 +312,6 @@ void avcodec_register_all(void)
+ 
+ void init_once_routine(void) {
+   pthread_mutex_init(&ffmpeg_lock, NULL);
+-  avcodec_init();
+   avcodec_register_all();
+ }
+ 
+-- 
+1.7.10.4
+
--- a/src/xine-lib.mk	Tue Jun 12 23:37:49 2012 +0200
+++ b/src/xine-lib.mk	Tue Jun 12 23:07:46 2012 +0200
@@ -3,9 +3,9 @@
 
 PKG             := xine-lib
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 68e85049723b491ccb22d5123bf8fa780529868a
+$(PKG)_CHECKSUM := 0adf20ef55d24f2a1b4a8974e57ad1be5133b236
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/xine/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc faad2 ffmpeg flac fontconfig freetype graphicsmagick libiconv libmng pthreads sdl speex theora vorbis zlib