SOURCES: quicktime4linux-acam.patch, quicktime4linux-libs.patch, quicktime4...

qboosh qboosh at pld-linux.org
Thu Aug 28 00:07:24 CEST 2008 

Author: qboosh                       Date: Wed Aug 27 22:07:24 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.3

---- Files affected:
SOURCES:
   quicktime4linux-acam.patch (1.15 -> 1.16) , quicktime4linux-libs.patch (1.7 -> 1.8) , quicktime4linux-x264.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/quicktime4linux-acam.patch
diff -u SOURCES/quicktime4linux-acam.patch:1.15 SOURCES/quicktime4linux-acam.patch:1.16
--- SOURCES/quicktime4linux-acam.patch:1.15	Wed Jul  5 11:09:23 2006
+++ SOURCES/quicktime4linux-acam.patch	Thu Aug 28 00:07:17 2008
@@ -1,8 +1,7 @@
-diff -Nur quicktime.orig/Makefile.am quicktime/Makefile.am
---- quicktime.orig/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ quicktime/Makefile.am	Sat May 11 21:29:10 2002
-@@ -0,0 +1,49 @@
-+ENCORE_DIR = encore50
+--- quicktime4linux-2.3/Makefile.am.orig	1970-01-01 01:00:00.000000000 +0100
++++ quicktime4linux-2.3/Makefile.am	2008-08-27 23:09:04.538116710 +0200
+@@ -0,0 +1,52 @@
++ENCORE_DIR = thirdparty/encore50
 +DECORE_DIR = #decore50
 +ENCORE_INCLUDE = $(ENCORE_DIR)/encore.h
 +#DECORE_INCLUDE = $(DECORE_DIR)/decore.h
@@ -11,14 +10,15 @@
 +lib_LTLIBRARIES = libquicktime.la
 +libquicktime_la_SOURCES = atom.c avcc.c avi_hdrl.c avi_ix.c avi_idx1.c avi_indx.c avi_movi.c \
 +	avi_odml.c avi_riff.c avi_strl.c cmodel_default.c cmodel_float.c cmodel_yuv420p.c cmodel_yuv422.c \
-+	codecs.c colormodels.c ctab.c dinf.c dref.c edts.c elst.c esds.c graphics.c hdlr.c \
++	codecs.c colormodels.c ctab.c dinf.c dref.c edts.c elst.c esds.c frma.c graphics.c hdlr.c \
 +	ima4.c jpeg.c libdv.c libmjpeg.c matrix.c mdat.c mdhd.c mdia.c minf.c \
-+	moov.c mp4a.c mpeg4.c mvhd.c plugin.c qtcache.c qtdv.c qtffmpeg.c qth264.c qtpng.c qtmp3.c quicktime.c raw.c rawaudio.c rle.c smhd.c \
++	moov.c mp4a.c mvhd.c plugin.c qtasf.c qtcache.c qtdv.c qtpng.c qtmp3.c quicktime.c raw.c rawaudio.c rle.c smhd.c \
 +	stbl.c stco.c stsc.c stsd.c stsdtable.c stss.c stsz.c stts.c tkhd.c trak.c twos.c \
-+	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
++	udta.c ulaw.c util.c v308.c v408.c v410.c vbraudio.c vmhd.c vorbis.c wmx2.c workarounds.c \
++	yuv2.c yuv4.c yv12.c \
++	mpeg4.c qdm2.c qtffmpeg.c qth264.c wma.c
 +
-+libquicktime_la_LDFLAGS = -version-info 3:0:2
++libquicktime_la_LDFLAGS = -version-info 4:0:3
 +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
@@ -28,19 +28,20 @@
 +	libdv.h libmjpeg.h jpeg.h cmodel_permutation.h
 +
 +INCLUDES = $(LIBDV_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS) \
-+	   -I/usr/include/libmpeg3 -I/usr/include/lame -I/usr/include/ffmpeg \
++	   -I/usr/include/libmpeg3 -I/usr/include/lame -I/usr/include/libavcodec \
 +	   -I$(ENCORE_DIR) \
 +	   -DENCORE_INCLUDE=\"$(ENCORE_INCLUDE)\" \
 +	   -DLINUX -D_DECORE -D_REENTRANT \
 +	   -DHAVE_FIREWIRE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 +
-+bin_PROGRAMS = qtdump qtmake_streamable qtinfo qtdechunk qtyuv4toyuv qtrecover qtrechunk
++bin_PROGRAMS = qtdump qtmake_streamable qtinfo qtdechunk qtyuv2mov qtyuv4toyuv qtrecover qtrechunk
 +
 +qtdump_SOURCES = dump.c
 +qtmake_streamable_SOURCES = make_streamable.c
 +qtdechunk_SOURCES = dechunk.c
 +qtrechunk_SOURCES = rechunk.c
 +qtrecover_SOURCES = recover.c
++qtyuv2mov_SOURCES = yuv2mov.c
 +qtyuv4toyuv_SOURCES = yuv4toyuv.c
 +qtinfo_SOURCES = qtinfo.c
 +
@@ -49,12 +50,13 @@
 +qtdechunk_LDADD = libquicktime.la
 +qtrechunk_LDADD = libquicktime.la
 +qtrecover_LDADD = libquicktime.la
++qtyuv2mov_LDADD = libquicktime.la
 +qtyuv4toyuv_LDADD = libquicktime.la
 +qtinfo_LDADD = libquicktime.la
 --- 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.2)
++AC_INIT(quicktime4linux, 2.3)
 +AM_INIT_AUTOMAKE
 +AC_CONFIG_SRCDIR([atom.c])
 +AM_CONFIG_HEADER([config.h])
@@ -88,11 +90,10 @@
 +PKG_CHECK_MODULES(LIBDV, libdv >= 0.104)
 +
 +AC_CONFIG_FILES([Makefile
-+		 encore50/Makefile])
++		 thirdparty/encore50/Makefile])
 +AC_OUTPUT
-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
+--- quicktime.orig/thirdparty/encore50/Makefile.am	Thu Jan  1 01:00:00 1970
++++ quicktime/thirdparty/encore50/Makefile.am	Sat May 11 20:15:59 2002
 @@ -0,0 +1,5 @@
 +noinst_LTLIBRARIES = libencore.la
 +

================================================================
Index: SOURCES/quicktime4linux-libs.patch
diff -u SOURCES/quicktime4linux-libs.patch:1.7 SOURCES/quicktime4linux-libs.patch:1.8
--- SOURCES/quicktime4linux-libs.patch:1.7	Tue Nov  1 13:44:31 2005
+++ SOURCES/quicktime4linux-libs.patch	Thu Aug 28 00:07:18 2008
@@ -25,8 +25,8 @@
  #include <pthread.h>
  #include <sys/time.h>
  
---- quicktime4linux-2.1/libmjpeg.h.orig	2005-08-09 07:35:17.000000000 +0200
-+++ quicktime4linux-2.1/libmjpeg.h	2005-10-11 21:02:25.040495192 +0200
+--- quicktime4linux-2.3/libmjpeg.h.orig	2008-02-03 14:06:52.000000000 +0100
++++ quicktime4linux-2.3/libmjpeg.h	2008-08-27 23:04:07.574121739 +0200
 @@ -30,9 +30,9 @@
  
  
@@ -36,6 +36,6 @@
  #include <png.h>              /* Need setjmp.h as included by png.h */
 -#include "pthread.h"
 +#include <pthread.h>
+ #include <setjmp.h>
  
  #define MAXFIELDS 2
- #define QUICKTIME_MJPA_MARKSIZE 40

================================================================
Index: SOURCES/quicktime4linux-x264.patch
diff -u SOURCES/quicktime4linux-x264.patch:1.1 SOURCES/quicktime4linux-x264.patch:1.2
--- SOURCES/quicktime4linux-x264.patch:1.1	Wed Sep 13 00:16:36 2006
+++ SOURCES/quicktime4linux-x264.patch	Thu Aug 28 00:07:18 2008
@@ -1,21 +1,11 @@
-diff -urN aaa/quicktime4linux-2.2/qth264.c quicktime4linux-2.2/qth264.c
---- aaa/quicktime4linux-2.2/qth264.c	2006-05-30 08:57:46.000000000 +0200
-+++ quicktime4linux-2.2/qth264.c	2006-09-12 23:48:39.483409960 +0200
-@@ -138,7 +138,7 @@
- 		x264_param_t default_params;
- 		x264_param_default(&default_params);
- // Reset quantizer if fixed bitrate
--		if(codec->param.rc.b_cbr)
-+		if(codec->param.rc.i_rc_method == X264_RC_ABR)
- 		{
- 			codec->param.rc.i_qp_constant = default_params.rc.i_qp_constant;
- 			codec->param.rc.i_qp_min = default_params.rc.i_qp_min;
-@@ -471,7 +471,7 @@
- 		}
- 		else
- 		if(!strcasecmp(key, "h264_fix_bitrate"))
--			codec->param.rc.b_cbr = (*(int*)value) / 1000;
-+			codec->param.rc.i_bitrate = (*(int*)value) / 1000;
- 	}
- }
+--- quicktime4linux-2.3/qth264.c.orig	2008-08-10 02:58:16.000000000 +0200
++++ quicktime4linux-2.3/qth264.c	2008-08-27 23:48:40.186117548 +0200
+@@ -12,7 +12,7 @@
+ //#define MANUAL_HEADER
  
+ // For the working version
+-#define GOOD_VERSION
++//#define GOOD_VERSION
+ 
+ typedef struct
+ {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/quicktime4linux-acam.patch?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/quicktime4linux-libs.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/quicktime4linux-x264.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list