Author: qboosh Date: Tue Oct 11 20:20:35 2005 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- partially updated for 2.1
---- Files affected:
SOURCES:
quicktime4linux-acam.patch (1.11 -> 1.11.2.1) , quicktime4linux-libs.patch
(1.6 -> 1.6.2.1)
---- Diffs:
================================================================
Index: SOURCES/quicktime4linux-acam.patch
diff -u SOURCES/quicktime4linux-acam.patch:1.11
SOURCES/quicktime4linux-acam.patch:1.11.2.1
--- SOURCES/quicktime4linux-acam.patch:1.11 Sun Aug 22 18:34:41 2004
+++ SOURCES/quicktime4linux-acam.patch Tue Oct 11 22:20:29 2005
@@ -9,25 +9,25 @@
+
+SUBDIRS = $(DECORE_DIR) $(ENCORE_DIR)
+lib_LTLIBRARIES = libquicktime.la
-+libquicktime_la_SOURCES = atom.c avi_hdrl.c avi_ix.c avi_idx1.c avi_indx.c
avi_movi.c \
++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 dv.c edts.c elst.c esds.c
graphics.c hdlr.c \
-+ ima4.c jpeg.c jpeg_old.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 qtpng.c qtmp3.c quicktime.c raw.c
rawaudio.c rle.c smhd.c \
++ codecs.c colormodels.c ctab.c dinf.c dref.c edts.c elst.c esds.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 qtdv.c qtffmpeg.c qth264.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
+
-+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 \
+ $(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
================================================================
Index: SOURCES/quicktime4linux-libs.patch
diff -u SOURCES/quicktime4linux-libs.patch:1.6
SOURCES/quicktime4linux-libs.patch:1.6.2.1
--- SOURCES/quicktime4linux-libs.patch:1.6 Wed Nov 12 20:43:57 2003
+++ SOURCES/quicktime4linux-libs.patch Tue Oct 11 22:20:29 2005
@@ -25,14 +25,13 @@
#include <pthread.h>
#include <sys/time.h>
-diff -uNr quicktime.orig/libmjpeg.h quicktime/libmjpeg.h
---- quicktime.orig/libmjpeg.h Wed Nov 28 16:03:55 2001
-+++ quicktime/libmjpeg.h Fri Nov 8 19:02:43 2002
+--- 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
@@ -30,9 +30,9 @@
#include <stdio.h>
--#include "jpeg/jpeglib.h"
+-#include "jpeglib.h"
+#include <jpeglib.h>
#include <png.h> /* Need setjmp.h as included by png.h */
-#include "pthread.h"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/quicktime4linux-acam.patch?r1=1.11&r2=1.11.2.1&f=u
http://cvs.pld-linux.org/SOURCES/quicktime4linux-libs.patch?r1=1.6&r2=1.6.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
