Here is an update to Xine-lib 1.2.3..
* Add OpenGL 2.0 output plugin
* Add crop support to XShm output plugins
* Add color matrix and full range support to OpenGL/Xv/XShm output plugins
* Add test image generator input plugin
* Add fast libjpeg based JPEG decoder
* Add max. Xv image size detection to Xv video output plugin
* Fix crash when trying to display too large jpeg image with Xv output plugin
* Fix possible crash when stopping playback with deinterlacing enabled
* Support large PAT in MPEG TS
* Handle EAC3 audio
Tested on amd64.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
--- Makefile 14 May 2013 01:54:22 -0000 1.102
+++ Makefile 30 May 2013 17:37:01 -0000
@@ -4,13 +4,12 @@ SHARED_ONLY= Yes
COMMENT= multimedia decoding library
-DISTNAME= xine-lib-1.2.2
-REVISION= 2
+DISTNAME= xine-lib-1.2.3
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS= xine 30.0
+SHARED_LIBS= xine 30.1
HOMEPAGE= http://www.xine-project.org/
@@ -22,11 +21,11 @@ PERMIT_PACKAGE_FTP= Yes
WANTLIB= FLAC GL GLU ICE SDL SM X11 Xext Xinerama Xv XvMCW a52 avcodec \
avutil bluray c cdio dca dvdnav dvdread expat faad fontconfig \
- freetype iso9660 m mad modplug mpcdec mng ogg postproc pthread \
- pthread-stubs sndio speex theora usbhid vcdinfo vorbis wavpack \
- xcb-shape xcb-shm xcb-xv xcb xml2 z
+ freetype iso9660 jpeg m mad modplug mpcdec mng ogg postproc \
+ pthread pthread-stubs sndio speex theora usbhid vcdinfo vorbis \
+ wavpack xcb-shape xcb-shm xcb-xv xcb xml2 z
-XINEAPI_REV= 2.2
+XINEAPI_REV= 2.3
SUBST_VARS+= XINEAPI_REV
MODULES= devel/gettext
@@ -43,12 +42,13 @@ LIB_DEPENDS= audio/faad \
audio/speex \
audio/wavpack \
devel/sdl \
- multimedia/libbluray \
- multimedia/libdvdnav \
- multimedia/libtheora \
graphics/ffmpeg>=20111126 \
+ graphics/jpeg \
graphics/libmng \
- graphics/vcdimager
+ graphics/vcdimager \
+ multimedia/libbluray \
+ multimedia/libdvdnav \
+ multimedia/libtheora
MAKE_ENV= V=1
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo 29 Nov 2012 20:18:21 -0000 1.24
+++ distinfo 29 May 2013 17:33:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (xine-lib-1.2.2.tar.xz) = 4WVkUb5kAF7ylv+vz1CF1j731O5EdwJDkfjjAA0yU9Y=
-SIZE (xine-lib-1.2.2.tar.xz) = 4857248
+SHA256 (xine-lib-1.2.3.tar.xz) = 4GqeAdJjJTDmlNSpa7pxgQ4vRH+awDbSoVDEO6onhSo=
+SIZE (xine-lib-1.2.3.tar.xz) = 4905356
Index: patches/patch-configure_ac
===================================================================
RCS file: /home/cvs/ports/multimedia/xine-lib/patches/patch-configure_ac,v
retrieving revision 1.16
diff -u -p -r1.16 patch-configure_ac
--- patches/patch-configure_ac 29 Nov 2012 20:18:21 -0000 1.16
+++ patches/patch-configure_ac 29 May 2013 17:37:34 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.16 2012/11/29 20:18:21 brad Exp $
---- configure.ac.orig Sat Jun 9 13:30:18 2012
-+++ configure.ac Tue Nov 27 05:19:25 2012
-@@ -804,9 +804,7 @@ AC_ARG_ENABLE([optimizations],
+--- configure.ac.orig Tue Sep 4 21:02:11 2012
++++ configure.ac Wed May 29 13:35:39 2013
+@@ -811,9 +811,7 @@ AC_ARG_ENABLE([optimizations],
[AS_HELP_STRING([--disable-optimizations], [Don't try to guess
what optimization to enable])],
[], [test x"$enable_debug" != x"no" &&
enable_optimizations="no"])
AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], [test x"$enable_optimizations" =
x"no"])
@@ -12,7 +12,7 @@ $OpenBSD: patch-configure_ac,v 1.16 2012
dnl For multi-pass compilation: never when cross-compiling
if test x"$cross_compiling" != x"yes"; then
if test x"$GCC" = x"yes"; then
-@@ -830,7 +828,7 @@ AC_SUBST(O3_CFLAGS)
+@@ -837,7 +835,7 @@ AC_SUBST(O3_CFLAGS)
AC_SUBST(PASS1_CFLAGS)
AC_SUBST(PASS2_CFLAGS)
@@ -21,7 +21,7 @@ $OpenBSD: patch-configure_ac,v 1.16 2012
AC_SUBST(DEFAULT_OCFLAGS)
if test x"$arch_x86" != x"no" && test x"$enable_macosx_universal" = x"no";
then
-@@ -979,9 +977,9 @@ t q
+@@ -989,9 +987,9 @@ t q
b
:q
q"
Index: patches/patch-m4_decoders_m4
===================================================================
RCS file: /home/cvs/ports/multimedia/xine-lib/patches/patch-m4_decoders_m4,v
retrieving revision 1.2
diff -u -p -r1.2 patch-m4_decoders_m4
--- patches/patch-m4_decoders_m4 11 Apr 2013 17:34:00 -0000 1.2
+++ patches/patch-m4_decoders_m4 29 May 2013 17:37:35 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-m4_decoders_m4,v 1.2 2013/04/11 17:34:00 brad Exp $
---- m4/decoders.m4.orig Sun Feb 5 14:17:01 2012
-+++ m4/decoders.m4 Tue Apr 9 18:38:26 2013
-@@ -322,7 +322,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
+--- m4/decoders.m4.orig Wed May 29 08:33:05 2013
++++ m4/decoders.m4 Wed May 29 13:35:28 2013
+@@ -342,7 +342,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
[AC_CHECK_HEADERS([mpc/mpcdec.h],
[have_external_libmpcdec=yes], [have_external_libmpcdec=no])],
[AC_CHECK_LIB([mpcdec], [mpc_decoder_decode],
[AC_CHECK_HEADERS([mpcdec/mpcdec.h],
[have_external_libmpcdec=yes], [have_external_libmpcdec=no])],
Index: patches/patch-src_post_deinterlace_plugins_Makefile_in
===================================================================
RCS file:
/home/cvs/ports/multimedia/xine-lib/patches/patch-src_post_deinterlace_plugins_Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_post_deinterlace_plugins_Makefile_in
--- patches/patch-src_post_deinterlace_plugins_Makefile_in 29 Nov 2012
20:18:21 -0000 1.12
+++ patches/patch-src_post_deinterlace_plugins_Makefile_in 29 May 2013
17:37:33 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_post_deinterlace_plugins_Makefile_in,v 1.12 2012/11/29
20:18:21 brad Exp $
---- src/post/deinterlace/plugins/Makefile.in.orig Sun Jan 1 16:22:06 2012
-+++ src/post/deinterlace/plugins/Makefile.in Tue Jan 3 00:57:38 2012
-@@ -513,7 +513,7 @@ noinst_HEADERS = plugins.h greedyhmacros.h
+--- src/post/deinterlace/plugins/Makefile.in.orig Wed May 29 09:33:25 2013
++++ src/post/deinterlace/plugins/Makefile.in Wed May 29 13:35:40 2013
+@@ -538,7 +538,7 @@ noinst_HEADERS = plugins.h greedyhmacros.h
# doesn't run out of general registers trying to compile it.
noinst_LTLIBRARIES = libdeinterlacepluginsO1.la libdeinterlaceplugins.la
libdeinterlacepluginsO1_la_SOURCES = kdetv_greedyh.c $(debug_sources)
Index: patches/patch-src_post_deinterlace_plugins_greedy2frame_template_c
===================================================================
RCS file: patches/patch-src_post_deinterlace_plugins_greedy2frame_template_c
diff -N patches/patch-src_post_deinterlace_plugins_greedy2frame_template_c
--- patches/patch-src_post_deinterlace_plugins_greedy2frame_template_c 8 Dec
2012 09:03:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-src_post_deinterlace_plugins_greedy2frame_template_c,v 1.1
2012/12/08 09:03:18 brad Exp $
---- src/post/deinterlace/plugins/greedy2frame_template.c.orig Thu Nov 29
23:56:24 2012
-+++ src/post/deinterlace/plugins/greedy2frame_template.c Thu Nov 29
23:56:46 2012
-@@ -85,12 +85,14 @@
- */
-
-
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
- #if !defined(MASKS_DEFINED)
- #define MASKS_DEFINED
- static const mmx_t Mask = { uq: 0x7f7f7f7f7f7f7f7fll };
- #define TP GREEDYTWOFRAMETHRESHOLD, GREEDYTWOFRAMETHRESHOLD2
- static const mmx_t GreedyTwoFrameThreshold = { ub: {TP, TP, TP, TP} };
- #undef TP
-+#endif
- #endif
-
- #if defined(IS_MMXEXT)
Index: patches/patch-src_post_deinterlace_plugins_greedy2frame_template_sse2_c
===================================================================
RCS file:
patches/patch-src_post_deinterlace_plugins_greedy2frame_template_sse2_c
diff -N patches/patch-src_post_deinterlace_plugins_greedy2frame_template_sse2_c
--- patches/patch-src_post_deinterlace_plugins_greedy2frame_template_sse2_c
8 Dec 2012 09:03:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_post_deinterlace_plugins_greedy2frame_template_sse2_c,v
1.1 2012/12/08 09:03:18 brad Exp $
---- src/post/deinterlace/plugins/greedy2frame_template_sse2.c.orig Sat May
26 16:49:59 2012
-+++ src/post/deinterlace/plugins/greedy2frame_template_sse2.c Sat Dec 8
03:18:14 2012
-@@ -85,10 +85,12 @@
- */
-
-
-+#if defined(ARCH_X86) || defined(ARCH_X86_64)
- static const sse_t Mask128 = { uq: { 0x7f7f7f7f7f7f7f7fll,
0x7f7f7f7f7f7f7f7fll} };
- #define TP GREEDYTWOFRAMETHRESHOLD, GREEDYTWOFRAMETHRESHOLD2
- static const sse_t GreedyTwoFrameThreshold128 = { ub: {TP, TP, TP, TP, TP,
TP, TP, TP} };
- #undef TP
-+#endif
-
- static void DeinterlaceGreedy2Frame_SSE2(uint8_t *output, int outstride,
- deinterlace_frame_data_t *data,
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/multimedia/xine-lib/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST 29 Nov 2012 20:18:21 -0000 1.18
+++ pkg/PLIST 30 May 2013 17:27:38 -0000
@@ -77,6 +77,7 @@ lib/xine/plugins/${XINEAPI_REV}/xineplug
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_faad.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_ff.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_gsm610.so
+lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_libjpeg.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_lpcm.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_mad.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_decode_mpc.so
@@ -126,6 +127,7 @@ lib/xine/plugins/${XINEAPI_REV}/xineplug
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_rtp.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_rtsp.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_stdin_fifo.so
+lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_test.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_v4l2.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_inp_vcd.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_nsf.so
@@ -133,6 +135,7 @@ lib/xine/plugins/${XINEAPI_REV}/xineplug
lib/xine/plugins/${XINEAPI_REV}/xineplug_vdr.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_vo_out_none.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_vo_out_opengl.so
+lib/xine/plugins/${XINEAPI_REV}/xineplug_vo_out_opengl2.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_vo_out_raw.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_vo_out_sdl.so
lib/xine/plugins/${XINEAPI_REV}/xineplug_vo_out_xcbshm.so
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
