From 212777c34544561555836f82465ab4fb779ef430f1c4befd373e51439598c5a0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 10 Nov 2010 17:37:54 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libquicktime revision 20.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=eae0110e4d0627a8370a68826c3e6c49 --- libquicktime.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libquicktime.spec b/libquicktime.spec index f9aeb73..a8a3006 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -34,7 +34,7 @@ License: LGPLv2.1+ Group: Development/Languages/C and C++ AutoReqProv: on Version: 1.1.5 -Release: 1 +Release: 6 Url: http://libquicktime.sf.net Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-1.0.3-dont_disable_deprecated.patch From fb7b1a807262d564e8fec5f40dadf8db30e884dfc2d1e341f4aff5a0f4161e38 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Thu, 2 Dec 2010 09:23:10 +0000 Subject: [PATCH 2/2] update to 1.2.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=13 --- libquicktime-1.1.5.tar.bz2 | 3 -- libquicktime-1.2.0.tar.bz2 | 3 ++ libquicktime-jpeg7.patch | 34 -------------------- libquicktime.changes | 10 ++++++ libquicktime.spec | 63 ++++++++++++++++---------------------- 5 files changed, 40 insertions(+), 73 deletions(-) delete mode 100644 libquicktime-1.1.5.tar.bz2 create mode 100644 libquicktime-1.2.0.tar.bz2 delete mode 100644 libquicktime-jpeg7.patch diff --git a/libquicktime-1.1.5.tar.bz2 b/libquicktime-1.1.5.tar.bz2 deleted file mode 100644 index 53fd14f..0000000 --- a/libquicktime-1.1.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b42941b997619d9088f21bcc363e0bd8135c7a79b707fca4a6ae4e01bcd3a89 -size 776371 diff --git a/libquicktime-1.2.0.tar.bz2 b/libquicktime-1.2.0.tar.bz2 new file mode 100644 index 0000000..1bd0f5b --- /dev/null +++ b/libquicktime-1.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79cd7f40c7a15a84ae91c3a3c98244181a1af1ba3d4df7ba6698fd0efef97395 +size 790227 diff --git a/libquicktime-jpeg7.patch b/libquicktime-jpeg7.patch deleted file mode 100644 index cc694cc..0000000 --- a/libquicktime-jpeg7.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: plugins/mjpeg/libmjpeg.c -=================================================================== ---- plugins/mjpeg/libmjpeg.c.orig -+++ plugins/mjpeg/libmjpeg.c -@@ -479,6 +479,9 @@ static void new_jpeg_objects(mjpeg_compr - /* Ideally the error handler would be set here but it must be called in a thread */ - jpeg_create_decompress(&(engine->jpeg_decompress)); - engine->jpeg_decompress.raw_data_out = TRUE; -+#if JPEG_LIB_VERSION >= 70 -+ engine->jpeg_decompress.do_fancy_upsampling = FALSE; -+#endif - engine->jpeg_decompress.dct_method = JDCT_IFAST; - } - -@@ -665,6 +668,9 @@ static void decompress_field(mjpeg_compr - - // Reset by jpeg_read_header - engine->jpeg_decompress.raw_data_out = TRUE; -+#if JPEG_LIB_VERSION >= 70 -+ engine->jpeg_decompress.do_fancy_upsampling = FALSE; -+#endif - jpeg_start_decompress(&engine->jpeg_decompress); - - // Generate colormodel from jpeg sampling -@@ -786,6 +792,9 @@ static mjpeg_compressor* mjpeg_new_compr - result->jpeg_compress.in_color_space = JCS_RGB; - jpeg_set_quality(&(result->jpeg_compress), mjpeg->quality, 0); - -+#if JPEG_LIB_VERSION >= 70 -+ result->jpeg_compress.do_fancy_downsampling = FALSE; -+#endif - if(mjpeg->use_float) - result->jpeg_compress.dct_method = JDCT_FLOAT; - else diff --git a/libquicktime.changes b/libquicktime.changes index fae0a7a..7bc2f8a 100644 --- a/libquicktime.changes +++ b/libquicktime.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 2 08:56:58 UTC 2010 - puzel@novell.com + +- update to libquicktime-1.2.0 + - reading and writing of compressed packets for lots of + codecs + - cleanup of internals, enhancements, bugfixes +- drop libquicktime-jpeg7.patch (in upstream) +- clean up specfile + ------------------------------------------------------------------- Wed Nov 3 16:29:57 UTC 2010 - puzel@novell.com diff --git a/libquicktime.spec b/libquicktime.spec index a8a3006..7c00e1b 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,5 +1,5 @@ # -# spec file for package libquicktime (Version 1.1.5) +# spec file for package libquicktime (Version 1.2.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,62 +15,54 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libquicktime +Version: 1.2.0 +Release: 6 +%define DISTRIBUTABLE 1 +License: LGPLv2.1+ +Summary: A Library for Reading and Writing Quicktime Movie Files +Url: http://libquicktime.sf.net +Group: Development/Languages/C and C++ +Source0: %{name}-%{version}.tar.bz2 +# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches +Patch1: %{name}-1.0.3-dont_disable_deprecated.patch BuildRequires: alsa-devel +BuildRequires: dirac-devel BuildRequires: doxygen -BuildRequires: gtk2-devel +BuildRequires: fdupes BuildRequires: libavc1394-devel BuildRequires: libdv-devel BuildRequires: libjpeg-devel BuildRequires: libvorbis-devel -BuildRequires: dirac-devel +BuildRequires: gtk2-devel BuildRequires: sed -BuildRequires: fdupes -%define DISTRIBUTABLE 1 -License: LGPLv2.1+ -Group: Development/Languages/C and C++ -AutoReqProv: on -Version: 1.1.5 -Release: 6 -Url: http://libquicktime.sf.net -Source0: %{name}-%{version}.tar.bz2 -Patch1: %{name}-1.0.3-dont_disable_deprecated.patch -Patch2: libquicktime-jpeg7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: A Library for Reading and Writing Quicktime Movie Files -Provides: quicktime4linux -Obsoletes: quicktime4linux %description A library for reading and writing Quicktime movie files, based on and forked from quicktime4linux. - - %package devel License: GPLv2+ Summary: Library for reading/writing quicktime movie files Group: Development/Libraries/Other -Provides: quicktime4linux-devel -Obsoletes: quicktime4linux-devel -Requires: %{name} = %{version} -Requires: glibc-devel, zlib-devel, libavc1394-devel, libdv-devel +Requires: %{name} = %{version} +Requires: glibc-devel, +Requires: libavc1394-devel, +Requires: libdv-devel +Requires: zlib-devel, %description devel library for reading/writing quicktime movie files, based on and forked from quicktime4linux - - %prep %setup -q # fix brokem links in API docs sed -r 's/"(building|codecs|index|license|opening|positioning|reading|util|writing).html/"qt4l_&/' -i `find doc -type f` %patch1 -p1 -%patch2 -p0 %build autoreconf -f -i -v @@ -86,17 +78,17 @@ autoreconf -f -i -v --without-x264 \ %endif --disable-static -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -make DESTDIR="%{buildroot}" install -ln -s lqt %{buildroot}/usr/include/quicktime +%make_install +ln -s lqt %{buildroot}%{_includedir}/quicktime %find_lang %{name} -find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + -%fdupes "%{buildroot}" +find %{buildroot} -type f -name "*.la" -delete -print +%fdupes %{buildroot} %clean -rm -rf "%{buildroot}" +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -105,7 +97,7 @@ rm -rf "%{buildroot}" %files -f %{name}.lang %defattr(-, root, root) %{_bindir}/* -%exclude %{_bindir}/lqt-config +%exclude %{_bindir}/libquicktime_config %{_libdir}/lib*.so.* %dir %{_libdir}/libquicktime %{_libdir}/libquicktime/lqt_*.so @@ -114,13 +106,12 @@ rm -rf "%{buildroot}" %files devel %defattr(-, root, root) -%{_bindir}/lqt-config +%{_bindir}/libquicktime_config %dir %{_includedir}/lqt %{_includedir}/lqt/*.h %{_includedir}/quicktime %{_libdir}/lib*.so %{_libdir}/pkgconfig/libquicktime.pc -%{_datadir}/aclocal/lqt.m4 %doc %{_defaultdocdir}/%{name}-devel %changelog