2 a.m.
Author: kwizart
Update of /cvs/free/rpms/libmpeg3/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17215
Modified Files:
libmpeg3.spec .cvsignore sources
Added Files:
libmpeg3-1.8-cinelerra_autotools.patch
Log Message:
Update to 1.8
libmpeg3-1.8-cinelerra_autotools.patch:
--- NEW FILE libmpeg3-1.8-cinelerra_autotools.patch ---
diff -uNr libmpeg3-1.7/audio/ac3.c libmpeg3-cinelerra/audio/ac3.c
--- libmpeg3-1.7/audio/ac3.c 2006-01-11 05:42:23.000000000 +0100
+++ libmpeg3-cinelerra/audio/ac3.c 2007-07-05 00:42:40.000000000 +0200
@@ -1,7 +1,7 @@
#include <stdint.h>
#include <stdio.h>
-#include "a52.h"
+#include <a52dec/a52.h>
#include "mpeg3private.h"
#include "mpeg3protos.h"
diff -uNr libmpeg3-1.7/audio/Makefile.am libmpeg3-cinelerra/audio/Makefile.am
--- libmpeg3-1.7/audio/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ libmpeg3-cinelerra/audio/Makefile.am 2007-07-05 00:42:40.000000000 +0200
@@ -0,0 +1,12 @@
+noinst_LTLIBRARIES = libmpeg3_audio.la
+libmpeg3_audio_la_SOURCES = ac3.c dct.c huffman.c layer2.c layer3.c mpeg3audio.c pcm.c
synthesizers.c tables.c
+libmpeg3_audio_la_LDFLAGS =
+
+noinst_HEADERS = ac3.h huffman.h mpeg3audio.h tables.h
+
+AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
+AM_CXXFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
+INCLUDES=-I$(srcdir)/..
+
+LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS)
+
diff -uNr libmpeg3-1.7/configure.in libmpeg3-cinelerra/configure.in
--- libmpeg3-1.7/configure.in 1970-01-01 01:00:00.000000000 +0100
+++ libmpeg3-cinelerra/configure.in 2007-09-08 23:27:17.000000000 +0200
@@ -0,0 +1,102 @@
+# Process this file with autoconf to produce a configure script.
+AC_INIT(libmpeg3, 1.8)
+AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ(2.53)
+AM_CONFIG_HEADER([config.h])
+AM_PROG_AS
+AC_ENABLE_SHARED
+AC_ENABLE_STATIC
+AC_PROG_LIBTOOL
+
+LIBMPEG3_VERSION_CURRENT=1
+LIBMPEG3_VERSION_REVISION=0
+LIBMPEG3_VERSION_AGE=0
+LIBMPEG3_VERSION_INFO=$LIBMPEG3_VERSION_CURRENT:$LIBMPEG3_VERSION_REVISION:$LIBMPEG3_VERSION_AGE
+AC_SUBST(LIBMPEG3_VERSION_INFO)
+
+# Checks for programs.
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_CPP
+AC_PROG_CXX
+# hack for using nasm for .S files
+#CCAS="nasm"
+AC_SUBST(CCAS)
+AC_SUBST(CCASFLAGS)
+
+############## MMX
+
+AC_ARG_ENABLE(mmx,
+ AC_HELP_STRING([--enable-mmx], [enables support for mmx (default is autodetect)]),
+ [ enable_mmx=$enableval ],[ enable_mmx=auto ])
+case "$target_cpu" in
+i586 | i686)
+ test "x$enable_mmx" = "xauto" && enable_mmx=yes
+
+ CPU_CFLAGS="-DX86_CPU $CPU_CFLAGS"
+
+ if test "x$enable_mmx" = "xyes"; then
+ CPU_CFLAGS="-DHAVE_MMX -DUSE_MMX $CPU_CFLAGS" # -D_MMX_ doesn't work
+ enable_mmx32=yes
+ fi
+;;
+x86_64)
+ test "x$enable_mmx" = "xauto" && enable_mmx=yes
+ CPU_CFLAGS="-DX86_CPU $CPU_CFLAGS"
+ if test "x$enable_mmx" = "xyes"; then
+ CPU_CFLAGS="-DHAVE_MMX -DUSE_MMX $CPU_CFLAGS"
+
+ fi
+;;
+esac
+
+test "x$enable_mmx" = "xauto" && enable_mmx=no
+
+AM_CONDITIONAL(USEMMX, test "x$enable_mmx" = "xyes")
+AM_CONDITIONAL(USEMMX32, test "x$enable_mmx32" = "xyes")
+AM_CONDITIONAL(TARGET_BUILTIN_VECTOR,test "x$enable_mmx" = "xyes")
+AC_SUBST(LIBDECORE_LIBADD)
+AC_SUBST(CPU_CFLAGS)
+
+############## END OF MMX
+
+LARGEFILE_CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64"
+AC_SUBST(LARGEFILE_CFLAGS)
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([stdlib.h string.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_STRUCT_TM
+
+## Checks for libraries.
+
+dnl A52 Support
+AC_CHECK_LIB(a52,a52_init,[liba52=yes])
+AC_CHECK_HEADER(a52dec/a52.h,[liba52h=yes])
+
+if test "x$liba52$liba52h" = "xyesyes"; then
+ A52DEC_CFLAGS=
+ A52DEC_LIBS=-la52
+fi
+AC_SUBST(A52DEC_CFLAGS)
+AC_SUBST(A52DEC_LIBS)
+
+dnl Quicktime Support
+PKG_CHECK_MODULES([QUICKTIME], [libquicktime],[quicktime=true],
+ [AC_MSG_WARN([libquicktime is not installed - mpeg2qt will not be built])
+ ])
+AM_CONDITIONAL(HAVE_QUICKTIME, [test x$quicktime = xtrue])
+
+AC_CONFIG_FILES([
+Makefile
+audio/Makefile
+video/Makefile
+libmpeg3.spec
+libmpeg3.pc
+])
+AC_OUTPUT
+
diff -uNr libmpeg3-1.7/Makefile.am libmpeg3-cinelerra/Makefile.am
--- libmpeg3-1.7/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ libmpeg3-cinelerra/Makefile.am 2007-09-08 22:58:17.000000000 +0200
@@ -0,0 +1,64 @@
+lib_LTLIBRARIES = libmpeg3.la
+AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
+libmpeg3_la_LDFLAGS = -version-info @LIBMPEG3_VERSION_INFO@
+libmpeg3_la_LIBADD = @A52DEC_LIBS@ video/libmpeg3_video.la audio/libmpeg3_audio.la -lm \
+ -lpthread
+libmpeg3_la_SOURCES = libmpeg3.c mpeg3bits.c mpeg3atrack.c mpeg3css.c \
+ mpeg3demux.c \
+ mpeg3ifo.c \
+ mpeg3io.c \
+ mpeg3strack.c \
+ mpeg3title.c \
+ mpeg3tocutil.c \
+ mpeg3vtrack.c \
+ workarounds.c
+
+bin_PROGRAMS = mpeg3dump mpeg3peek mpeg3toc mpeg3cat
+mpeg3dump_SOURCES = mpeg3dump.c
+mpeg3dump_LDADD = libmpeg3.la
+mpeg3dump_CFLAGS = $(AM_CFLAGS)
+mpeg3peek_SOURCES = mpeg3peek.c
+mpeg3peek_LDADD = libmpeg3.la
+mpeg3peek_CFLAGS = $(AM_CFLAGS)
+mpeg3toc_SOURCES = mpeg3toc.c
+mpeg3toc_LDADD = libmpeg3.la
+mpeg3toc_CFLAGS = $(AM_CFLAGS)
+mpeg3cat_SOURCES = mpeg3cat.c
+mpeg3cat_LDADD = libmpeg3.la
+mpeg3cat_CFLAGS = $(AM_CFLAGS)
+if HAVE_QUICKTIME
+bin_PROGRAMS += mpeg2qt
+mpeg2qt_SOURCES = mpeg2qt.c
+mpeg2qt_LDADD = libmpeg3.la @QUICKTIME_LIBS@
+mpeg2qt_CFLAGS = $(AM_CFLAGS) @QUICKTIME_CFLAGS@
+endif
+
+SUBDIRS = audio video
+
+EXTRA_DIST = docs
+
+noinst_HEADERS = bitstream.h \
+ ifo.h \
+ libmpeg3.h \
+ mpeg3atrack.h \
+ mpeg3css.h \
+ mpeg3css_fake.c \
+ mpeg3demux.h \
+ mpeg3io.h \
+ mpeg3private.h \
+ mpeg3private.inc \
+ mpeg3protos.h \
+ mpeg3title.h \
+ mpeg3vtrack.h \
+ timecode.h \
+ workarounds.h
+
+dist_noinst_SCRIPTS = bootstrap
+
+pkgincludedir=$(includedir)/mpeg3
+pkginclude_HEADERS=libmpeg3.h mpeg3private.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libmpeg3.pc
+
+LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS)
diff -uNr libmpeg3-1.7/video/Makefile.am libmpeg3-cinelerra/video/Makefile.am
--- libmpeg3-1.7/video/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ libmpeg3-cinelerra/video/Makefile.am 2007-07-05 00:42:40.000000000 +0200
@@ -0,0 +1,29 @@
+noinst_LTLIBRARIES = libmpeg3_video.la
+libmpeg3_video_la_SOURCES = getpicture.c headers.c idct.c macroblocks.c mmxtest.c
motion.c \
+ mpeg3cache.c \
+ mpeg3video.c \
+ output.c \
+ reconstruct.c \
+ seek.c \
+ slice.c \
+ subtitle.c \
+ vlc.c
+
+if USEMMX
+libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s
+else
+libmpeg3_video_la_SOURCES +=
+endif
+
+noinst_HEADERS = idct.h \
+ layerdata.h \
+ mpeg3video.h \
+ mpeg3videoprotos.h \
+ slice.h \
+ vlc.h
+
+libmpeg3_video_la_LDFLAGS=
+AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
+INCLUDES=-I$(srcdir)/..
+
+LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS)
Index: libmpeg3.spec
===================================================================
RCS file: /cvs/free/rpms/libmpeg3/devel/libmpeg3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmpeg3.spec 3 Aug 2008 14:43:42 -0000 1.1
+++ libmpeg3.spec 8 Oct 2008 02:00:47 -0000 1.2
@@ -1,13 +1,12 @@
Summary: Decoder of various derivatives of MPEG standards
Name: libmpeg3
-Version: 1.7
-Release: 6%{?dist}
+Version: 1.8
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://heroinewarrior.com/libmpeg3.php3
Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2
-Patch0: libmpeg3-1.7-makefile.patch
-Patch1: libmpeg3-1.7-cinelerra_autotools.patch
+Patch1: libmpeg3-1.8-cinelerra_autotools.patch
Patch2: libmpeg3-1.7-cinelerra_hacking.patch
Patch3: libmpeg3-1.7-fix_commented.patch
Patch4: libmpeg3-1.7-spec_in.patch
@@ -16,11 +15,12 @@
# Patches 7/8 from gentoo
#http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libmpeg3/files/
Patch7: libmpeg3-1.5.2-gnustack.patch
-Patch8: libmpeg3-1.7-memcpy.patch
+Patch9: libmpeg3-1.7-mpeg2qt-args.patch
+Patch10: libmpeg3-1.8-mmx.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nasm
BuildRequires: a52dec-devel
-
+BuildRequires: libquicktime-devel
BuildRequires: libtool
%description
@@ -63,17 +63,15 @@
%prep
%setup -q
-#patch0 -p1 -b .makefile
-
# Removed unneeded files
-#rm -rf a52dec-* depend.a52
+rm -rf a52dec-* depend.a52
# Patch autotools
%patch1 -p1
# Thoses patches was taken from cinepaint cvs
# Which have special libmpeg3
-#patch2 -p1 -b .cine_hack
+%patch2 -p1 -b .cine_hack
# Fix comments
%patch3 -p1 -b .commented
@@ -89,7 +87,12 @@
# gentoo patches
%patch7 -p1 -b .gnustack
-%patch8 -p1 -b .memcpy
+
+# Patch the number of arguments of mpeg2qt
+%patch9 -p1 -b .args
+
+# Patch to add mmx possibility via nasm/yasm
+%patch10 -p1 -b .mmx
# Touch docs files:
touch INSTALL README NEWS AUTHORS ChangeLog
@@ -102,14 +105,22 @@
%build
# Enable USE_MMX for archs that support it, not by default on i386
%configure --enable-shared --disable-static \
-%ifarch i686 x86_64
-# --enable-mmx \
+%ifarch i686
+ --enable-mmx \
%endif
# This seems not to work with x86_64 on AMD64
# Error: suffix or operands invalid for `push'
#sed -i -e 's|$(CCASFLAGS)|#$(CCASFLAGS)|g' video/Makefile
+# Hack to have mmx compiled on i686
+%ifarch i686
+pushd video
+mkdir -p .libs
+nasm -f elf reconmmx.s -o .libs/reconmmx.o
+popd
+%endif
+
make %{?_smp_mflags}
@@ -145,6 +156,7 @@
%{_bindir}/mpeg3dump
%{_bindir}/mpeg3peek
%{_bindir}/mpeg3toc
+%{_bindir}/mpeg2qt
%files devel
%doc docs/*
@@ -155,8 +167,13 @@
%changelog
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.7-6
-- rebuild
+* Mon Aug 11 2008 kwizart < kwizart at gmail.com > - 1.8-1
+- Upate to 1.8
+- Enable cinelerra-cv hacks
+
+* Sat Jan 10 2008 kwizart < kwizart at gmail.com > - 1.7-6
+- Fix mpeg2qt linked with libquicktime
+- Disable mmx
* Fri Sep 28 2007 kwizart < kwizart at gmail.com > - 1.7-5
- Add gentoo patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libmpeg3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 14:43:42 -0000 1.2
+++ .cvsignore 8 Oct 2008 02:00:47 -0000 1.3
@@ -1 +1 @@
-libmpeg3-1.7-src.tar.bz2
+libmpeg3-1.8-src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libmpeg3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 14:43:42 -0000 1.2
+++ sources 8 Oct 2008 02:00:47 -0000 1.3
@@ -1 +1 @@
-4a3e8896164d59d7d0dff69b50b75352 libmpeg3-1.7-src.tar.bz2
+a9d0d34e8941a4437eb8e7dfe559eca1 libmpeg3-1.8-src.tar.bz2