SHA256
1
0
forked from pool/libquicktime
Takashi Iwai 2015-02-27 14:46:15 +00:00 committed by Git OBS Bridge
parent f27f0e2240
commit 604ae90d32
6 changed files with 23 additions and 51 deletions

View File

@ -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"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368
size 1028626

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9441ccba87112832212bb8ec23840a9e3cc6113dd8fdb9df984ace0aeaca7c6c
size 639860

View File

@ -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 <quicktime/colormodels.h>
#include <png.h>
+#include <string.h>
#include <stdlib.h>
#include "qtpng.h"

View File

@ -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 Fri Oct 3 17:26:11 UTC 2014 - crrodriguez@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package libquicktime # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,26 +17,27 @@
%define soname 0 %define soname 0
%define cvs 20150223
Name: libquicktime Name: libquicktime
Version: 1.2.4 Version: 1.2.4cvs%{cvs}
Release: 0 Release: 0
#to_be_filled_by_service #to_be_filled_by_service
Summary: Library for Reading and Writing Quicktime Movie Files Summary: Library for Reading and Writing Quicktime Movie Files
License: GPL-2.0+ License: GPL-2.0+
Group: System/Libraries Group: System/Libraries
Url: http://libquicktime.sf.net Url: http://libquicktime.sf.net
Source0: http://prdownloads.sourceforge.net/libquicktime/libquicktime-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Source1: COPYING Source1: COPYING
Source2: baselibs.conf Source2: baselibs.conf
Patch0: %{name}-1.2.2-dont_disable_deprecated.patch BuildRequires: autoconf
# build also with libpng16, patch sent to amp@singingwizard.org, plaum@ipf.uni-stuttgart.de, kraxel@bytesex.org BuildRequires: automake
Patch1: libquicktime-libpng16.patch
BuildRequires: alsa-devel BuildRequires: alsa-devel
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: libdv-devel BuildRequires: libdv-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libtool
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: schroedinger-devel BuildRequires: schroedinger-devel
@ -92,14 +93,16 @@ Requires: %{name}%{soname} = %{version}
Tools for reading/writing quicktime movie files. Tools for reading/writing quicktime movie files.
%prep %prep
%setup -q %setup -q -n %{name}
%patch0
%patch1 -p1 sed -i 's/-DGTK_DISABLE_DEPRECATED//g' configure.ac
# Replace licence with wrong FSF address # Replace licence with wrong FSF address
cp -v %{S:1} . cp -v %{S:1} .
%build %build
echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in
./autogen.sh
%configure \ %configure \
--enable-gpl \ --enable-gpl \
--docdir="%{_docdir}/%{name}-devel" \ --docdir="%{_docdir}/%{name}-devel" \