From 1c9cf258b0804a82fb168e319b867b7992fa99234ea8cbb65f0d246105c7e78e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 4 May 2007 15:26:37 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libquicktime?expand=0&rev=2 --- fix-libtool | 26 ----- libquicktime-0.9.10.tar.bz2 | 3 - libquicktime-1.0.0-arrayoverflow.patch | 19 ++++ libquicktime-1.0.0.tar.gz | 3 + libquicktime-gcc4.diff | 22 ----- libquicktime-legal.diff | 30 ------ libquicktime-lib64.diff | 11 --- libquicktime-mjpeg_def_huffman.diff | 128 ------------------------- libquicktime.changes | 7 ++ libquicktime.spec | 84 ++++++++-------- 10 files changed, 67 insertions(+), 266 deletions(-) delete mode 100644 fix-libtool delete mode 100644 libquicktime-0.9.10.tar.bz2 create mode 100644 libquicktime-1.0.0-arrayoverflow.patch create mode 100644 libquicktime-1.0.0.tar.gz delete mode 100644 libquicktime-gcc4.diff delete mode 100644 libquicktime-legal.diff delete mode 100644 libquicktime-lib64.diff delete mode 100644 libquicktime-mjpeg_def_huffman.diff diff --git a/fix-libtool b/fix-libtool deleted file mode 100644 index c516211..0000000 --- a/fix-libtool +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# fix broken libtool -# -# Can someone please LART the one who over-designed it? -# Thank you. - -workdir="$1" - -tmpfile="/tmp/tmpfile-$$" -trap "rm -f $tmpfile" EXIT - -# disable -rpath -file=`find $workdir -name libtool` -sed -e 's|\(hardcode_into_libs\)=.*|\1=no|' \ - < $file > $tmpfile -mv $tmpfile $file -chmod 755 $file - -# disable relinking -find $workdir -name \*.la -type f -print |\ -while read file; do - grep -v relink $file > $tmpfile - mv $tmpfile $file -done - diff --git a/libquicktime-0.9.10.tar.bz2 b/libquicktime-0.9.10.tar.bz2 deleted file mode 100644 index 0787468..0000000 --- a/libquicktime-0.9.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e13b80da728655bb16b5689f7abbbe3d7002ab2ea8c80b703f907534df132fe -size 631385 diff --git a/libquicktime-1.0.0-arrayoverflow.patch b/libquicktime-1.0.0-arrayoverflow.patch new file mode 100644 index 0000000..68e3ff5 --- /dev/null +++ b/libquicktime-1.0.0-arrayoverflow.patch @@ -0,0 +1,19 @@ +*** include/quicktime/qtprivate.h 2007-05-04 14:43:22.717609750 +0200 +--- include/quicktime/qtprivate.h.new 2007-05-04 14:43:37.138511000 +0200 +*************** +*** 165,171 **** + long correction; + long quality; + long directdraw; +! long imagingProperties[5]; + long reserved1; + long reserved2; + } quicktime_impn_t; +--- 165,171 ---- + long correction; + long quality; + long directdraw; +! long imagingProperties[6]; + long reserved1; + long reserved2; + } quicktime_impn_t; diff --git a/libquicktime-1.0.0.tar.gz b/libquicktime-1.0.0.tar.gz new file mode 100644 index 0000000..608256f --- /dev/null +++ b/libquicktime-1.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60c478fd81450e18a1fcf1bcee672d5cd04c4ca5871ffb709ef6a635111141a4 +size 998950 diff --git a/libquicktime-gcc4.diff b/libquicktime-gcc4.diff deleted file mode 100644 index ce4146d..0000000 --- a/libquicktime-gcc4.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- plugins/rtjpeg/RTjpeg.c -+++ plugins/rtjpeg/RTjpeg.c -@@ -98,7 +98,7 @@ - register int ci, co=1, tmp; - register int16_t ZZvalue; - -- (uint8_t)strm[0]=(uint8_t)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]); -+ strm[0]=(uint8_t)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]); - - for(ci=1; ci<=bt8; ci++) - { ---- quicktime1394/libdv.h -+++ quicktime1394/libdv.h -@@ -16,7 +16,7 @@ - #define DV_PAL 1 - - #ifndef u_int64_t --#define u_int64_t unsigned long long -+/*define u_int64_t unsigned long long*/ - #endif - - #include diff --git a/libquicktime-legal.diff b/libquicktime-legal.diff deleted file mode 100644 index 8aeac4d..0000000 --- a/libquicktime-legal.diff +++ /dev/null @@ -1,30 +0,0 @@ -Index: plugins/Makefile.am -=================================================================== ---- plugins/Makefile.am.orig -+++ plugins/Makefile.am -@@ -10,12 +10,6 @@ else - jpeg_subdirs= - endif - --if HAVE_LAME --lame_subdirs = lame --else --lame_subdirs= --endif -- - if HAVE_LIBDV - dv_subdirs = dv - else -@@ -34,12 +28,6 @@ else - vorbis_subdirs= - endif - --if HAVE_LIBAVCODEC --libavcodec_subdirs=ffmpeg --else --libavcodec= --endif -- - if HAVE_FAAD2 - faad2_subdirs=faad2 - else diff --git a/libquicktime-lib64.diff b/libquicktime-lib64.diff deleted file mode 100644 index b17357e..0000000 --- a/libquicktime-lib64.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- libquicktime-0.9.1/configure.ac -+++ libquicktime-0.9.1/configure.ac -@@ -589,7 +589,7 @@ - if test "x$exec_prefix" = xNONE; then - exec_prefix="${prefix}" - fi --plugin_dir="$exec_prefix/lib/$PACKAGE" -+plugin_dir="$libdir/$PACKAGE" - - - AH_TEMPLATE([PLUGIN_DIR], [Directory for plugins]) diff --git a/libquicktime-mjpeg_def_huffman.diff b/libquicktime-mjpeg_def_huffman.diff deleted file mode 100644 index c9337e1..0000000 --- a/libquicktime-mjpeg_def_huffman.diff +++ /dev/null @@ -1,128 +0,0 @@ -Index: plugins/mjpeg/libmjpeg.c -=================================================================== ---- plugins/mjpeg/libmjpeg.c.orig -+++ plugins/mjpeg/libmjpeg.c -@@ -24,6 +24,7 @@ - #include "colormodels.h" - #include "lqt.h" - #include "libmjpeg.h" -+#include /* JERR_BAD_HUFF_TABLE */ - - /* JPEG MARKERS */ - #define M_SOF0 0xc0 -@@ -616,6 +617,115 @@ static void guarantee_huff_tables(j_deco - } - } - -+static void -+add_huff_table_d(j_decompress_ptr cinfo, -+ JHUFF_TBL **htblptr, const unsigned char *bits, const unsigned char *val) -+/* Define a Huffman table */ -+{ -+ int nsymbols, len; -+ -+ if (*htblptr == NULL) -+ *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo); -+ -+ /* Copy the number-of-symbols-of-each-code-length counts */ -+ memcpy((*htblptr)->bits, bits, sizeof((*htblptr)->bits)); -+ -+ /* Validate the counts. We do this here mainly so we can copy the right -+ * number of symbols from the val[] array, without risking marching off -+ * the end of memory. jchuff.c will do a more thorough test later. -+ */ -+ nsymbols = 0; -+ for (len = 1; len <= 16; len++) -+ nsymbols += bits[len]; -+ if (nsymbols < 1 || nsymbols > 256) -+ ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); -+ -+ memcpy((*htblptr)->huffval, val, nsymbols * sizeof(unsigned char)); -+} -+ -+ -+static void std_huff_tables_d(j_decompress_ptr cinfo) -+{ -+ /* tables taken from jpeg-6b:jcparam.c, 2005-09-15, jw@suse.de */ -+ /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ -+ /* IMPORTANT: these are only valid for 8-bit data precision! */ -+ -+ static const unsigned char bits_dc_luminance[17] = -+ { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; -+ static const unsigned char val_dc_luminance[] = -+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; -+ -+ static const unsigned char bits_dc_chrominance[17] = -+ { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; -+ static const unsigned char val_dc_chrominance[] = -+ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; -+ -+ static const unsigned char bits_ac_luminance[17] = -+ { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; -+ static const unsigned char val_ac_luminance[] = -+ { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, -+ 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, -+ 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, -+ 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, -+ 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, -+ 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, -+ 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, -+ 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, -+ 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, -+ 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, -+ 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, -+ 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, -+ 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, -+ 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, -+ 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, -+ 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, -+ 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, -+ 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, -+ 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, -+ 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, -+ 0xf9, 0xfa }; -+ -+ static const unsigned char bits_ac_chrominance[17] = -+ { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; -+ static const unsigned char val_ac_chrominance[] = -+ { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, -+ 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, -+ 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, -+ 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, -+ 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, -+ 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, -+ 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, -+ 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, -+ 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, -+ 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, -+ 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, -+ 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, -+ 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, -+ 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, -+ 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, -+ 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, -+ 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, -+ 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, -+ 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, -+ 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, -+ 0xf9, 0xfa }; -+ -+ if (cinfo->data_precision != 8) -+ { -+ printf("decompress_field has no default ac/dc-tables for data_precision=%d\n", -+ cinfo->data_precision); -+ return; -+ } -+ -+ add_huff_table_d(cinfo, &cinfo->dc_huff_tbl_ptrs[0], -+ bits_dc_luminance, val_dc_luminance); -+ add_huff_table_d(cinfo, &cinfo->ac_huff_tbl_ptrs[0], -+ bits_ac_luminance, val_ac_luminance); -+ add_huff_table_d(cinfo, &cinfo->dc_huff_tbl_ptrs[1], -+ bits_dc_chrominance, val_dc_chrominance); -+ add_huff_table_d(cinfo, &cinfo->ac_huff_tbl_ptrs[1], -+ bits_ac_chrominance, val_ac_chrominance); -+} - - static void decompress_field(mjpeg_compressor *engine, int field) - { diff --git a/libquicktime.changes b/libquicktime.changes index adce6db..f990383 100644 --- a/libquicktime.changes +++ b/libquicktime.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 4 13:50:27 CEST 2007 - pcerny@suse.cz + +- update to 1.0.0 which is considered final wrt functionality +- .spec file cleanup +- fixed #218037 + ------------------------------------------------------------------- Tue Oct 10 12:48:04 CEST 2006 - pnemec@suse.cz diff --git a/libquicktime.spec b/libquicktime.spec index b683f87..773e676 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ # -# spec file for package libquicktime (Version 0.9.10) +# spec file for package libquicktime (Version 1.0.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,20 +11,16 @@ # norootforbuild Name: libquicktime -BuildRequires: alsa-devel gtk2-devel libavc1394-devel libdv-devel libjpeg-devel libvorbis-devel +BuildRequires: alsa-devel gtk2-devel libavc1394-devel libdv-devel libjpeg-devel libvorbis-devel sed %define DISTRIBUTABLE 1 -License: GPL +License: GNU General Public License (GPL) Group: Development/Libraries/Other Autoreqprov: on -Version: 0.9.10 +Version: 1.0.0 Release: 1 URL: http://libquicktime.sf.net -Source0: %{name}-%{version}.tar.bz2 -Source1: fix-libtool -Patch1: %{name}-legal.diff -Patch3: %{name}-lib64.diff -Patch4: %{name}-gcc4.diff -Patch5: %{name}-mjpeg_def_huffman.diff +Source0: %{name}-%{version}.tar.gz +Patch0: %{name}-%{version}-arrayoverflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Library for Reading and Writing Quicktime Movie Files Provides: quicktime4linux @@ -52,67 +48,63 @@ from quicktime4linux %prep %setup -q -%if %DISTRIBUTABLE -%patch1 -%endif -%patch3 -p1 -b .lib64 -#%patch4 -p0 -b .gcc4 -%patch5 -# the default cpuinfo.sh sets e.g. -march=pentium4 if cpuinfo says P4: -echo \ -echo $RPM_OPT_FLAGS -fexpensive-optimizations >cpuinfo.sh +# fix brokem links in API docs +sed -r "s/(building|codecs|index|license|opening|positioning|reading|util|writing).html/qt4l_&/" -i doc/* +%patch0 -p0 %build -autoreconf --force --install # autoreconf does libtoolize and update_config -./configure --prefix=/usr \ - --x-includes=/usr/X11R6/include \ - --x-libraries=/usr/X11R6/%{_lib} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --enable-static -sh $RPM_SOURCE_DIR/fix-libtool . +./configure --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --enable-gpl \ +%if %DISTRIBUTABLE + --without-lame --without-faad2 --without-faac \ + --without-x264 --without-ffmpeg \ +%endif + --disable-static --htmldir=/usr/html make %install -test "%{buildroot}" != "" -a "%{buildroot}" != "/" \ - && rm -rf "%{buildroot}" -sh $RPM_SOURCE_DIR/fix-libtool . make DESTDIR="%{buildroot}" install -rm %{buildroot}/usr/lib*/libquicktime/lqt_*.a -rm %{buildroot}/usr/lib*/libquicktime/lqt_*.la ln -s lqt %{buildroot}/usr/include/quicktime -#find %{buildroot} -print # debug %clean rm -rf "%{buildroot}" -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr(-, root, root) -/usr/bin/* +%{_bindir}/* +%exclude %{_bindir}/lqt-config %{_libdir}/lib*.so.* %dir %{_libdir}/libquicktime %{_libdir}/libquicktime/lqt_*.so %{_mandir}/man1/* -%doc [A-LN-Z]* +%{_datadir}/locale/de/LC_MESSAGES/libquicktime.mo +%doc ChangeLog COPYING %files devel %defattr(-, root, root) +%{_bindir}/lqt-config +%dir %{_includedir}/lqt +%{_includedir}/lqt/*.h +%{_includedir}/quicktime %attr(644,root,root) %{_libdir}/lib*.la -%attr(644,root,root) %{_libdir}/lib*.a +%attr(644,root,root) %{_libdir}/libquicktime/lqt_*.la %{_libdir}/lib*.so -%dir /usr/include/lqt -/usr/include/lqt/*.h -/usr/include/quicktime -/usr/share/aclocal/lqt.m4 %{_libdir}/pkgconfig/libquicktime.pc +%{_datadir}/aclocal/lqt.m4 +%doc doc/*.html doc/*.txt -%changelog -n libquicktime +%changelog +* Fri May 04 2007 - pcerny@suse.cz +- update to 1.0.0 which is considered final wrt functionality +- .spec file cleanup +- fixed #218037 * Tue Oct 10 2006 - pnemec@suse.cz - updated to 0.9.10 Read/Write support for: DVCPRO50 video, OpenDML AVIs, mp4/m4a files