[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] HG: xine-lib: Enable libmpeg2new only if configured with
From:       Darren Salt <linux () youmustbejoking ! demon ! co ! uk>
Date:       2009-03-08 16:41:11
Message-ID: ba642133c0c8b4ece4cb.1236529982 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Darren Salt <linux@youmustbejoking.demon.co.uk>
# Date 1236529982 0
# Node ID ba642133c0c8b4ece4cb4d2a98355afde7264900
# Parent  437d7036ba8d3d6c210f8c6b8983e989ea12aad9
Enable libmpeg2new only if configured with --enable-libmpeg2new.

diff -r ba642133c0c8b4ece4cb4d2a98355afde7264900 -r \
                437d7036ba8d3d6c210f8c6b8983e989ea12aad9 ChangeLog
--- a/ChangeLog	Sun Mar 08 16:33:02 2009 +0000
+++ b/ChangeLog	Sun Mar 08 16:31:49 2009 +0000
@@ -1,6 +1,6 @@ xine-lib (1.1.17) 2009-??-??
 xine-lib (1.1.17) 2009-??-??
-  * Enable libmpeg2new. This is not yet production code; the old mpeg2
-    decoder remains the default.
+  * Enable libmpeg2new (if configured with --enable-libmpeg2new).
+    This is not yet production code; the old mpeg2 decoder remains the default.
   * Add support for OpenBSD.
   * Fix a build failure on *BSD due to some rather useful GNUisms.
   * Protect audio loop so it cannot write to a paused device (fix
diff -r ba642133c0c8b4ece4cb4d2a98355afde7264900 -r \
                437d7036ba8d3d6c210f8c6b8983e989ea12aad9 configure.ac
--- a/configure.ac	Sun Mar 08 16:33:02 2009 +0000
+++ b/configure.ac	Sun Mar 08 16:31:49 2009 +0000
@@ -322,6 +322,10 @@ dnl ------------------------------------
 dnl ---------------------------------------------
 
 AC_SUBST(LIBMPEG2_CFLAGS)
+
+AC_ARG_ENABLE([libmpeg2new],
+	AS_HELP_STRING([--enable-libmpeg2new], [build the newer MPEG2 decoder (buggy)]))
+AM_CONDITIONAL(ENABLE_MPEG2NEW, test "x$enable_libmpeg2new" = "xyes")
 
 AC_ARG_WITH([external-ffmpeg], AS_HELP_STRING([--with-external-ffmpeg], [use \
external ffmpeg library]))  
diff -r ba642133c0c8b4ece4cb4d2a98355afde7264900 -r \
                437d7036ba8d3d6c210f8c6b8983e989ea12aad9 src/libmpeg2new/Makefile.am
--- a/src/libmpeg2new/Makefile.am	Sun Mar 08 16:33:02 2009 +0000
+++ b/src/libmpeg2new/Makefile.am	Sun Mar 08 16:31:49 2009 +0000
@@ -3,7 +3,11 @@ include $(top_srcdir)/misc/Makefile.comm
 
 SUBDIRS = include libmpeg2
 
-xineplug_LTLIBRARIES = xineplug_decode_mpeg2new.la
+if ENABLE_MPEG2NEW
+mpeg2new_module = xineplug_decode_mpeg2new.la
+endif
+
+xineplug_LTLIBRARIES = $(mpeg2new_module)
 
 xineplug_decode_mpeg2new_la_SOURCES = \
 	xine_mpeg2new_decoder.c
diff -r ba642133c0c8b4ece4cb4d2a98355afde7264900 -r \
                437d7036ba8d3d6c210f8c6b8983e989ea12aad9 \
                src/libmpeg2new/libmpeg2/Makefile.am
--- a/src/libmpeg2new/libmpeg2/Makefile.am	Sun Mar 08 16:33:02 2009 +0000
+++ b/src/libmpeg2new/libmpeg2/Makefile.am	Sun Mar 08 16:31:49 2009 +0000
@@ -1,6 +1,10 @@ include $(top_srcdir)/misc/Makefile.comm
 include $(top_srcdir)/misc/Makefile.common
 
-noinst_LTLIBRARIES = libmpeg2.la libmpeg2arch.la
+if ENABLE_MPEG2NEW
+mpeg2new_libs = libmpeg2.la libmpeg2arch.la
+endif
+
+noinst_LTLIBRARIES = $(mpeg2new_libs)
 
 libmpeg2_la_SOURCES = alloc.c header.c decode.c slice.c motion_comp.c idct.c
 libmpeg2_la_LIBADD = libmpeg2arch.la

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]