SOURCES: quicktime4linux-acam.patch - merged from DEVEL

[qboosh]

Author: qboosh                       Date: Mon Oct 31 12:13:08 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SOURCES:
   quicktime4linux-acam.patch (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/quicktime4linux-acam.patch
diff -u SOURCES/quicktime4linux-acam.patch:1.12 SOURCES/quicktime4linux-acam.patch:1.13
--- SOURCES/quicktime4linux-acam.patch:1.12	Mon Oct 31 13:08:39 2005
+++ SOURCES/quicktime4linux-acam.patch	Mon Oct 31 13:13:03 2005
@@ -18,16 +18,16 @@
 +	udta.c ulaw.c util.c v308.c v408.c v410.c vbraudio.c vmhd.c vorbis.c wma.c wmx2.c workarounds.c \
 +	yuv2.c yuv4.c yv12.c
 +
-+libquicktime_la_LDFLAGS = -version-info 2:4:1
++libquicktime_la_LDFLAGS = -version-info 3:0:2
 +libquicktime_la_LIBADD = -lpng -ljpeg -lmpeg3 -lavcodec -lmp3lame -lfaad -lx264 \
 +	$(LIBDV_LIBS) $(OGG_LIBS) $(VORBIS_LIBS) $(VORBISENC_LIBS) \
 +	-lavcodec $(ENCORE_DIR)/libencore.la -ldl -lpthread
 +
 +includedir = $(prefix)/include/quicktime
 +include_HEADERS = quicktime.h qtprivate.h codecs.h funcprotos.h colormodels.h graphics.h \
-+	libdv.h libmjpeg.h jpeg_old.h jpeg.h
++	libdv.h libmjpeg.h jpeg.h
 +
-+INCLUDES = $(GLIB_CFLAGS) $(LIBDV_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) \
++INCLUDES = $(LIBDV_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) \
 +	   -I/usr/include/libmpeg3 -I/usr/include/lame -I/usr/include/ffmpeg \
 +	   -I$(ENCORE_DIR) \
 +	   -DENCORE_INCLUDE=\"$(ENCORE_INCLUDE)\" \
@@ -51,11 +51,10 @@
 +qtrecover_LDADD = libquicktime.la
 +qtyuv4toyuv_LDADD = libquicktime.la
 +qtinfo_LDADD = libquicktime.la
-diff -Nur quicktime.orig/configure.in quicktime/configure.in
---- quicktime.orig/configure.in	Thu Jan  1 01:00:00 1970
-+++ quicktime/configure.in	Sat May 11 21:28:27 2002
-@@ -0,0 +1,38 @@
-+AC_INIT(quicktime4linux, 2.0.4)
+--- quicktime.orig/configure.ac	Thu Jan  1 01:00:00 1970
++++ quicktime/configure.ac	Sat May 11 21:28:27 2002
+@@ -0,0 +1,36 @@
++AC_INIT(quicktime4linux, 2.1)
 +AM_INIT_AUTOMAKE
 +AC_CONFIG_SRCDIR([atom.c])
 +AM_CONFIG_HEADER([config.h])
@@ -83,29 +82,14 @@
 +AC_FUNC_VPRINTF
 +AC_CHECK_FUNCS([bzero floor memset pow select sqrt strcasecmp])
 +
-+AM_PATH_GLIB
 +XIPH_PATH_OGG
 +XIPH_PATH_VORBIS
 +
-+PKG_CHECK_MODULES(LIBDV, libdv >= 0.99)
++PKG_CHECK_MODULES(LIBDV, libdv >= 0.104)
 +
 +AC_CONFIG_FILES([Makefile
-+		 decore50/Makefile
 +		 encore50/Makefile])
 +AC_OUTPUT
-diff -Nur quicktime.orig/decore50/Makefile.am quicktime/decore50/Makefile.am
---- quicktime.orig/decore50/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ quicktime/decore50/Makefile.am	Sat May 11 20:12:38 2002
-@@ -0,0 +1,9 @@
-+noinst_LTLIBRARIES = libdecore.la
-+
-+libdecore_la_SOURCES = debug.c decore.c getbits.c mp4_vars.c mp4_block.c \
-+	mp4_decoder.c mp4_header.c mp4_iquant.c mp4_mblock.c mp4_picture.c \
-+	mp4_predict.c mp4_recon.c mp4_tables.c mp4_vld.c \
-+	basic_prediction.c clearblock.c idct.c postprocess.c transferidct.c yuv2rgb.c
-+
-+INCLUDES = -DLINUX -D_DECORE -D_REENTRANT \
-+	   -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 diff -Nur quicktime.orig/encore50/Makefile.am quicktime/encore50/Makefile.am
 --- quicktime.orig/encore50/Makefile.am	Thu Jan  1 01:00:00 1970
 +++ quicktime/encore50/Makefile.am	Sat May 11 20:15:59 2002
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/quicktime4linux-acam.patch?r1=1.12&r2=1.13&f=u