diff options
author | drochner <drochner@pkgsrc.org> | 2004-10-27 20:31:33 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2004-10-27 20:31:33 +0000 |
commit | 4c8677a37b74d7f4401c7991bd3fe659ec8d0daf (patch) | |
tree | afa27809017e0e433b17b8a464a9cc8b7eafac22 | |
parent | 5cd812982e7f160bc11cd7d9d343c4f99137be0c (diff) | |
download | pkgsrc-4c8677a37b74d7f4401c7991bd3fe659ec8d0daf.tar.gz |
update to xine-lib-1-rc6a
New Features:
- Added support for Annodex bitsream format. The Annodex bitstream
format is a subset of the Ogg encapsulation format: it"s basically
Ogg with extra timing information, so that time-based stream
- Added support for VobSub-in-Matroska (Vobsub is raw subtitle
stream from a DVD. This patch enables support for VobSub
- Added support for 44100Hz DTS in .wav files
- Added experimental time stretching plugin: play stream faster or
slower than original speed, optionally preserving pitch
- Added configure option for building xine with external ffmpeg
library
- Added api for finer playback speed control (requires frontend
support)
- Added support for QuickTime 6.3 DLLs
- Added support for mp3 audio in mp4 files
- Added support for using utf-8 for matroska subtitles
-rw-r--r-- | multimedia/xine-lib/Makefile | 4 | ||||
-rw-r--r-- | multimedia/xine-lib/Makefile.common | 7 | ||||
-rw-r--r-- | multimedia/xine-lib/PLIST.common | 8 | ||||
-rw-r--r-- | multimedia/xine-lib/distinfo | 15 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ag | 30 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-al | 42 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ao | 14 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-aw | 26 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ba | 52 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-bb | 35 |
10 files changed, 69 insertions, 164 deletions
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile index 75b5abf5241..822bd5c0173 100644 --- a/multimedia/xine-lib/Makefile +++ b/multimedia/xine-lib/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2004/10/03 00:13:03 tv Exp $ +# $NetBSD: Makefile,v 1.14 2004/10/27 20:31:33 drochner Exp $ # .include "Makefile.common" -PKGREVISION= 2 - .if ${MACHINE_ARCH} == "i386" DEPENDS+= win32-codecs>=011227:../../multimedia/win32-codecs PLIST_SUBST+= I386="" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index bd96b646308..af66b10fe3b 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.11 2004/09/09 07:50:53 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/10/27 20:31:33 drochner Exp $ # -DISTNAME= xine-lib-1-rc5 -PKGNAME= xine-lib-1rc5 +DISTNAME= xine-lib-1-rc6a +PKGNAME= xine-lib-1rc6a CATEGORIES?= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} @@ -25,6 +25,7 @@ PKGCONFIG_OVERRIDE= misc/libxine.pc.in USE_GNU_TOOLS+= make CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' +CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest CONFIGURE_ENV+= have_libpng="yes" CONFIGURE_ENV+= PNG_CFLAGS="-I${PREFIX}/include" CONFIGURE_ENV+= PNG_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng" diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common index ef261adb268..a2f0b17fc32 100644 --- a/multimedia/xine-lib/PLIST.common +++ b/multimedia/xine-lib/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.4 2004/09/22 08:09:46 jlam Exp $ +@comment $NetBSD: PLIST.common,v 1.5 2004/10/27 20:31:33 drochner Exp $ bin/xine-config include/xine.h include/xine/attributes.h @@ -32,8 +32,8 @@ include/xine/xmllexer.h include/xine/xmlparser.h lib/libxine.la lib/pkgconfig/libxine.pc -lib/xine/plugins/1.0.0/post/xineplug_post_audio_filter_upmix.a -lib/xine/plugins/1.0.0/post/xineplug_post_audio_filter_upmix.so +lib/xine/plugins/1.0.0/post/xineplug_post_audio_filters.a +lib/xine/plugins/1.0.0/post/xineplug_post_audio_filters.so lib/xine/plugins/1.0.0/post/xineplug_post_goom.a lib/xine/plugins/1.0.0/post/xineplug_post_goom.so lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.a @@ -86,6 +86,8 @@ lib/xine/plugins/1.0.0/xineplug_decode_spu.a lib/xine/plugins/1.0.0/xineplug_decode_spu.so lib/xine/plugins/1.0.0/xineplug_decode_spucc.a lib/xine/plugins/1.0.0/xineplug_decode_spucc.so +lib/xine/plugins/1.0.0/xineplug_decode_spucmml.a +lib/xine/plugins/1.0.0/xineplug_decode_spucmml.so lib/xine/plugins/1.0.0/xineplug_decode_sputext.a lib/xine/plugins/1.0.0/xineplug_decode_sputext.so lib/xine/plugins/1.0.0/xineplug_decode_vorbis.a diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index 1bedcf44ca1..e4b9deb65b5 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,18 +1,17 @@ -$NetBSD: distinfo,v 1.8 2004/08/10 11:24:46 drochner Exp $ +$NetBSD: distinfo,v 1.9 2004/10/27 20:31:33 drochner Exp $ -SHA1 (xine-lib-1-rc5.tar.gz) = b38aa71ab717ba04f03591d1d003da4ce23ed1cf -Size (xine-lib-1-rc5.tar.gz) = 7052663 bytes +SHA1 (xine-lib-1-rc6a.tar.gz) = 9359543ae3cc34f25af08ef42cbd13f08cae8398 +Size (xine-lib-1-rc6a.tar.gz) = 7003035 bytes SHA1 (patch-aa) = beb7617b8361c06cf5224f0027731f025f7dc519 SHA1 (patch-ab) = a5205d23d02dff84b0e8a9f850f3833cacc28c5a SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938 -SHA1 (patch-ag) = bc7374182a0812baf619e9648c608f1b80982b67 +SHA1 (patch-ag) = f9e0a5e57e24739e2526266e1804b2a0b4ff41ed SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97 -SHA1 (patch-al) = af557ce4fd64e11f84947e067f445e59628c6f99 SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16 -SHA1 (patch-ao) = aa9fbe13b00f6e8bbf1857b4d29147dc63bbc8d4 +SHA1 (patch-ao) = ccf11ec7335b745a9c998906c4ff61e7a5631ed6 SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f SHA1 (patch-aq) = ec5707d3b7b69912342afc7bef3e8cd182c75ded SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30 @@ -20,5 +19,5 @@ SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba SHA1 (patch-at) = b43d07b20f209a31df454620673a21f174550cf9 SHA1 (patch-au) = 569ac1d00402eb3679bf99f0afe5832f425b3b0e SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa -SHA1 (patch-aw) = 748feea39a7c41f40e56f463dde9186430c2a74f -SHA1 (patch-ba) = 82b69dd37c287a23efb9b80188e47cb1d97cb359 +SHA1 (patch-ba) = a527975fe9675358090bddc1361b707aa122f89b +SHA1 (patch-bb) = fcfdf5dae066837cb35e51a5d114c366a5b3a7b2 diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag index b367ccefbf9..7673f939ed5 100644 --- a/multimedia/xine-lib/patches/patch-ag +++ b/multimedia/xine-lib/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.4 2004/06/21 15:55:55 drochner Exp $ +$NetBSD: patch-ag,v 1.5 2004/10/27 20:31:33 drochner Exp $ ---- configure.ac.orig 2004-06-21 01:39:04.000000000 +0200 +--- configure.ac.orig 2004-09-16 17:10:45.000000000 +0200 +++ configure.ac -@@ -351,6 +351,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- +@@ -385,6 +385,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="- AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",) AC_SUBST(NET_LIBS) @@ -11,26 +11,8 @@ $NetBSD: patch-ag,v 1.4 2004/06/21 15:55:55 drochner Exp $ +AC_SUBST(WINE_LIBS) dnl --------------------------------------------- - dnl IPv6 -@@ -398,7 +401,7 @@ case "$host" in - AC_CHECK_LIB(GL, glBegin, - [AC_CHECK_HEADER(GL/gl.h, - [ ac_have_opengl="yes" -- OPENGL_LIBS="-lGL" -+ OPENGL_LIBS="-lGL -lm" - AC_CHECK_LIB(glut, glutInit, dnl check for glut - [ ac_have_glut="yes" - GLUT_LIBS="-lglut" -@@ -416,7 +419,7 @@ case "$host" in - ], - [])], - [], -- [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS]) -+ [$X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS]) - ;; - esac - -@@ -596,8 +599,7 @@ dnl Checks for Xinerama extension + dnl socklen_t +@@ -610,8 +613,7 @@ dnl Checks for Xinerama extension dnl --------------------------------------------- AC_CHECK_LIB(Xinerama, XineramaQueryExtension, @@ -40,7 +22,7 @@ $NetBSD: patch-ag,v 1.4 2004/06/21 15:55:55 drochner Exp $ ac_have_xinerama="yes"],, [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS]) dnl AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes") -@@ -1031,9 +1033,10 @@ dnl ------------------------------------ +@@ -1015,9 +1017,10 @@ dnl ------------------------------------ dnl gnome-vfs support dnl --------------------------------------------- diff --git a/multimedia/xine-lib/patches/patch-al b/multimedia/xine-lib/patches/patch-al deleted file mode 100644 index 58e466db4fa..00000000000 --- a/multimedia/xine-lib/patches/patch-al +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ - ---- src/libw32dll/wine/win32.c.orig 2003-10-02 12:25:52.000000000 +0000 -+++ src/libw32dll/wine/win32.c 2003-10-02 12:21:50.000000000 +0000 -@@ -440,9 +440,8 @@ - - alccnt--; - -- if (last_alloc) -- pthread_mutex_unlock(&memmut); -- else -+ pthread_mutex_unlock(&memmut); -+ if (!last_alloc) - pthread_mutex_destroy(&memmut); - - //if (alccnt < 40000) printf("MY_RELEASE: %p\t%ld (%d)\n", header, header->size, alccnt); -@@ -1350,10 +1349,12 @@ - printf("wine/win32: Win32 Warning: Accessed uninitialized Critical Section (%p)!\n", c); - } - if(cs->locked) -- if(cs->id==pthread_self()) -+ if(cs->id==pthread_self()) { -+ cs->locked++; - return; -+ } - pthread_mutex_lock(&(cs->mutex)); -- cs->locked=1; -+ cs->locked++; /* should always be 1 */ - cs->id=pthread_self(); - return; - } -@@ -1371,8 +1372,8 @@ - printf("Win32 Warning: Leaving uninitialized Critical Section %p!!\n", c); - return; - } -- cs->locked=0; -- pthread_mutex_unlock(&(cs->mutex)); -+ if (!--cs->locked) -+ pthread_mutex_unlock(&(cs->mutex)); - return; - } - static void WINAPI expDeleteCriticalSection(CRITICAL_SECTION *c) diff --git a/multimedia/xine-lib/patches/patch-ao b/multimedia/xine-lib/patches/patch-ao index 3aead6ee22f..d281eafd318 100644 --- a/multimedia/xine-lib/patches/patch-ao +++ b/multimedia/xine-lib/patches/patch-ao @@ -1,16 +1,16 @@ -$NetBSD: patch-ao,v 1.3 2004/06/21 15:55:55 drochner Exp $ +$NetBSD: patch-ao,v 1.4 2004/10/27 20:31:33 drochner Exp $ ---- src/libw32dll/wine/Makefile.in.orig 2004-05-12 16:54:20.000000000 +0200 -+++ src/libw32dll/wine/Makefile.in 2004-05-17 21:28:41.000000000 +0200 -@@ -327,6 +327,7 @@ - VORBIS_LIBS = @VORBIS_LIBS@ +--- src/libw32dll/wine/Makefile.in.orig 2004-09-16 17:14:15.000000000 +0200 ++++ src/libw32dll/wine/Makefile.in +@@ -238,6 +238,7 @@ VORBIS_LIBS = @VORBIS_LIBS@ W32DLL_DEP = @W32DLL_DEP@ W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@ + WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ +WINE_LIBS = @WINE_LIBS@ - XGETTEXT = @XGETTEXT@ XINE_ACFLAGS = @XINE_ACFLAGS@ XINE_BIN_AGE = @XINE_BIN_AGE@ -@@ -476,7 +477,7 @@ + XINE_BUILD_CC = @XINE_BUILD_CC@ +@@ -351,7 +352,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libwine_la_LDFLAGS = diff --git a/multimedia/xine-lib/patches/patch-aw b/multimedia/xine-lib/patches/patch-aw deleted file mode 100644 index 51cf30419b5..00000000000 --- a/multimedia/xine-lib/patches/patch-aw +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2004/08/02 19:09:45 shannonjr Exp $ - ---- src/post/goom/Makefile.in.orig 2004-06-20 18:23:58.000000000 -0600 -+++ src/post/goom/Makefile.in -@@ -412,7 +412,6 @@ EXTRA_DIST = zoom_filter_mmx.c zoom_filt - - lib_LTLIBRARIES = xineplug_post_goom.la - --@HAVE_FFMMX_TRUE@@PPC_ARCH_FALSE@extra_files = zoom_filter_mmx.c zoom_filter_xmmx.c - @HAVE_FFMMX_TRUE@@PPC_ARCH_FALSE@MMX_CFLAG = -DHAVE_MMX - - xineplug_post_goom_la_SOURCES = $(extra_files) xine_goom.c \ -@@ -445,12 +444,10 @@ LTLIBRARIES = $(lib_LTLIBRARIES) - - xineplug_post_goom_la_DEPENDENCIES = \ - $(top_builddir)/src/xine-engine/libxine.la --am__xineplug_post_goom_la_SOURCES_DIST = zoom_filter_mmx.c \ -+am__xineplug_post_goom_la_SOURCES_DIST = _mmx.c \ - zoom_filter_xmmx.c xine_goom.c goom_core.c filters.c lines.c \ - ifs_display.c ifs.c graphic.c gfontlib.c gfontrle.c surf3d.c \ - surface.c tentacle3d.c --@HAVE_FFMMX_TRUE@@PPC_ARCH_FALSE@am__objects_1 = zoom_filter_mmx.lo \ --@HAVE_FFMMX_TRUE@@PPC_ARCH_FALSE@ zoom_filter_xmmx.lo - am_xineplug_post_goom_la_OBJECTS = $(am__objects_1) xine_goom.lo \ - goom_core.lo filters.lo lines.lo ifs_display.lo ifs.lo \ - graphic.lo gfontlib.lo gfontrle.lo surf3d.lo surface.lo \ diff --git a/multimedia/xine-lib/patches/patch-ba b/multimedia/xine-lib/patches/patch-ba index 49e22f18e69..27165233d09 100644 --- a/multimedia/xine-lib/patches/patch-ba +++ b/multimedia/xine-lib/patches/patch-ba @@ -1,44 +1,9 @@ -$NetBSD: patch-ba,v 1.1 2004/08/10 11:24:46 drochner Exp $ +$NetBSD: patch-ba,v 1.2 2004/10/27 20:31:33 drochner Exp $ ---- src/input/vcd/xineplug_inp_vcd.c.orig 2004-06-13 23:28:56.000000000 +0200 +--- src/input/vcd/xineplug_inp_vcd.c.orig 2004-07-27 04:08:48.000000000 +0200 +++ src/input/vcd/xineplug_inp_vcd.c -@@ -48,6 +48,7 @@ - #define SHORT_PLUGIN_NAME "VCD" - #define MRL_PREFIX "vcd://" - #define MRL_PREFIX_LEN strlen(MRL_PREFIX) -+#define MRL_MAX_LEN 1024 - - #define xine_config_entry_t xine_cfg_entry_t - -@@ -474,7 +475,7 @@ vcd_parse_mrl(/*in*/ const char *default - return false; - } - -- count = sscanf (p, "%[^@]@%1[EePpSsTt]%u", -+ count = sscanf (p, "%1024[^@]@%1[EePpSsTt]%u", - device_str, type_str, &num); - itemid->num = num; - -@@ -498,7 +499,7 @@ vcd_parse_mrl(/*in*/ const char *default - { - /* No device/file given, so use the default device and try again. */ - if (NULL == default_vcd_device) return false; -- strcpy(device_str, default_vcd_device); -+ strncpy(device_str, default_vcd_device, MRL_MAX_LEN); - if (p[0] == '@') p++; - count = sscanf (p, "%1[EePpSsTt]%u", type_str, &num); - type_str[0] = toupper(type_str[0]); -@@ -790,7 +791,7 @@ static xine_mrl_t ** - vcd_class_get_dir (input_class_t *this_gen, const char *filename, - int *num_files) { - -- char intended_vcd_device[1024]=""; -+ char intended_vcd_device[MRL_MAX_LEN+1]=""; - vcdinfo_itemid_t itemid; - - vcd_input_class_t *class = (vcd_input_class_t *) this_gen; -@@ -922,7 +923,7 @@ vcd_class_get_description (input_class_t - static char * +@@ -923,7 +923,7 @@ vcd_class_get_description (input_class_t + static const char * vcd_class_get_identifier (input_class_t *this_gen) { dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); - return SHORT_PLUGIN_NAME; @@ -46,12 +11,3 @@ $NetBSD: patch-ba,v 1.1 2004/08/10 11:24:46 drochner Exp $ } /* -@@ -1452,7 +1453,7 @@ vcd_class_get_instance (input_class_t *c - { - vcd_input_class_t *class = (vcd_input_class_t *) class_gen; - -- char intended_vcd_device[1024]=""; -+ char intended_vcd_device[MRL_MAX_LEN+1]=""; - vcdinfo_itemid_t itemid; - char *check_mrl=NULL; - bool used_default; diff --git a/multimedia/xine-lib/patches/patch-bb b/multimedia/xine-lib/patches/patch-bb new file mode 100644 index 00000000000..771ec7bca57 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-bb @@ -0,0 +1,35 @@ +$NetBSD: patch-bb,v 1.1 2004/10/27 20:31:33 drochner Exp $ + +--- aclocal.m4.orig 2004-09-16 17:12:40.000000000 +0200 ++++ aclocal.m4 +@@ -7941,12 +7941,6 @@ if test x"$external_ffmpeg" != "xno"; th + LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}" + + dnl drop the cache +- for i in "ac_cv_header_avcodec_h" "ac_cv_header_postprocess_h" \ +- "ac_cv_lib_avcodec_pp_get_context" \ +- "ac_cv_lib_postproc_pp_get_context" \ +- "ac_cv_lib_avcodec_register_avcodec"; do +- $as_unset $i || test "${$i+set}" != set || { $i=; export $i; } +- done + + dnl check the headers + AC_CHECK_HEADERS(avcodec.h postprocess.h, +@@ -8069,7 +8063,7 @@ AC_DEFUN([AM_PATH_OPENGL], [ + AC_CHECK_LIB(GL, glBegin, + [AC_CHECK_HEADER(GL/gl.h, + [ac_have_opengl="yes" +- OPENGL_LIBS="-lGL" ++ OPENGL_LIBS="-lGL -lm" + dnl check for glut + AC_CHECK_LIB(glut, glutInit, + [ac_have_glut="yes" +@@ -8094,7 +8088,7 @@ AC_DEFUN([AM_PATH_OPENGL], [ + ] + )], + [], +- [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS] ++ [$X_LIBS $X_PRE_LIBS -lGL -lm $X_EXTRA_LIBS] + ) + if test x$ac_have_opengl = "xyes" -a x$ac_have_glut = "xyes" -o x$ac_have_opengl = "xyes" -a x$ac_have_glu = "xyes"; then + ac_use_opengl=yes |