From 604ae90d32c74f76c124002b417d426a101b1b1707f2840968a2ad1cc865ec26 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 27 Feb 2015 14:46:15 +0000 Subject: [PATCH] Accepting request 287671 from home:awissu OBS-URL: https://build.opensuse.org/request/show/287671 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=55 --- ...cktime-1.2.2-dont_disable_deprecated.patch | 27 ------------------- libquicktime-1.2.4.tar.gz | 3 --- libquicktime-1.2.4cvs20150223.tar.gz | 3 +++ libquicktime-libpng16.patch | 12 --------- libquicktime.changes | 8 ++++++ libquicktime.spec | 21 ++++++++------- 6 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 libquicktime-1.2.2-dont_disable_deprecated.patch delete mode 100644 libquicktime-1.2.4.tar.gz create mode 100644 libquicktime-1.2.4cvs20150223.tar.gz delete mode 100644 libquicktime-libpng16.patch diff --git a/libquicktime-1.2.2-dont_disable_deprecated.patch b/libquicktime-1.2.2-dont_disable_deprecated.patch deleted file mode 100644 index fbbef3f..0000000 --- a/libquicktime-1.2.2-dont_disable_deprecated.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -398,7 +398,8 @@ AM_CONDITIONAL(HAVE_GTK, test x$have_gtk - AC_SUBST(GTK_REQUIRED) - - dnl Always be in sync with the newest gtk --GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED" -+dnl Ha ha! I thwart thee! -+GTK_CFLAGS="$GTK_CFLAGS" - - dnl - dnl Check for libdv -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -15899,7 +15899,7 @@ fi - - - --GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED" -+GTK_CFLAGS="$GTK_CFLAGS" - - - have_libdv="false" diff --git a/libquicktime-1.2.4.tar.gz b/libquicktime-1.2.4.tar.gz deleted file mode 100644 index d55c9bd..0000000 --- a/libquicktime-1.2.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368 -size 1028626 diff --git a/libquicktime-1.2.4cvs20150223.tar.gz b/libquicktime-1.2.4cvs20150223.tar.gz new file mode 100644 index 0000000..6e602e3 --- /dev/null +++ b/libquicktime-1.2.4cvs20150223.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9441ccba87112832212bb8ec23840a9e3cc6113dd8fdb9df984ace0aeaca7c6c +size 639860 diff --git a/libquicktime-libpng16.patch b/libquicktime-libpng16.patch deleted file mode 100644 index 076d209..0000000 --- a/libquicktime-libpng16.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libquicktime-1.2.4/plugins/png/qtpng.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/png/qtpng.c -+++ libquicktime-1.2.4/plugins/png/qtpng.c -@@ -25,6 +25,7 @@ - #include "lqt_private.h" - #include - #include -+#include - #include - #include "qtpng.h" - diff --git a/libquicktime.changes b/libquicktime.changes index 4b45b4d..23b86a7 100644 --- a/libquicktime.changes +++ b/libquicktime.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 23 10:03:51 UTC 2015 - avvissu@yandex.ru + +- Update to cvs20150223: +- Remove all patches (fixed in upstream): + * libquicktime-1.2.2-dont_disable_deprecated.patch + * libquicktime-libpng16.patch + ------------------------------------------------------------------- Fri Oct 3 17:26:11 UTC 2014 - crrodriguez@opensuse.org diff --git a/libquicktime.spec b/libquicktime.spec index ca56a9f..cbc9894 100644 --- a/libquicktime.spec +++ b/libquicktime.spec @@ -1,7 +1,7 @@ # # spec file for package libquicktime # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,26 +17,27 @@ %define soname 0 +%define cvs 20150223 Name: libquicktime -Version: 1.2.4 +Version: 1.2.4cvs%{cvs} Release: 0 #to_be_filled_by_service Summary: Library for Reading and Writing Quicktime Movie Files License: GPL-2.0+ Group: System/Libraries Url: http://libquicktime.sf.net -Source0: http://prdownloads.sourceforge.net/libquicktime/libquicktime-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz Source1: COPYING Source2: baselibs.conf -Patch0: %{name}-1.2.2-dont_disable_deprecated.patch -# build also with libpng16, patch sent to amp@singingwizard.org, plaum@ipf.uni-stuttgart.de, kraxel@bytesex.org -Patch1: libquicktime-libpng16.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: alsa-devel BuildRequires: doxygen BuildRequires: gtk2-devel BuildRequires: libdv-devel BuildRequires: libjpeg-devel +BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: pkg-config BuildRequires: schroedinger-devel @@ -92,14 +93,16 @@ Requires: %{name}%{soname} = %{version} Tools for reading/writing quicktime movie files. %prep -%setup -q -%patch0 -%patch1 -p1 +%setup -q -n %{name} + +sed -i 's/-DGTK_DISABLE_DEPRECATED//g' configure.ac + # Replace licence with wrong FSF address cp -v %{S:1} . %build echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in +./autogen.sh %configure \ --enable-gpl \ --docdir="%{_docdir}/%{name}-devel" \