Accepting request 36482 from multimedia:libs
Copy from multimedia:libs/schroedinger based on submit request 36482 from user prusnak OBS-URL: https://build.opensuse.org/request/show/36482 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/schroedinger?expand=0&rev=9
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
0ef991b306
commit
9b514e076c
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4789b4fcd1cd52ae8d57a63e5682dc2c6d0ea2b9c28e37506b844d6301e3870f
|
||||
size 678071
|
||||
12
schroedinger-1.0.9-fix-linking.patch
Normal file
12
schroedinger-1.0.9-fix-linking.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -p -up schroedinger-1.0.9/testsuite/Makefile.am.0000 schroedinger-1.0.9/testsuite/Makefile.am
|
||||
--- schroedinger-1.0.9/testsuite/Makefile.am.0000 2010-01-04 02:06:54.000000000 +0100
|
||||
+++ schroedinger-1.0.9/testsuite/Makefile.am 2010-03-10 12:04:36.000000000 +0100
|
||||
@@ -102,7 +102,7 @@ wavelet_noise_2d_SOURCES = wavelet_noise
|
||||
phasecorrelation_SOURCES = phasecorrelation.c
|
||||
|
||||
#motion_CFLAGS = $(SCHRO_CFLAGS)
|
||||
-#motion_LDADD = $(SCHRO_LIBS)
|
||||
+motion_LDADD = $(SCHRO_LIBS) -lorc-test-0.4
|
||||
motion_SOURCES = motion.c
|
||||
|
||||
#motion2_CFLAGS = $(SCHRO_CFLAGS)
|
||||
3
schroedinger-1.0.9.tar.bz2
Normal file
3
schroedinger-1.0.9.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:759451e26448635ee7c005bb5ec9a24a0959232846a775a4df987c83a0e9a416
|
||||
size 718506
|
||||
@ -1,24 +0,0 @@
|
||||
From: David Schleef <ds@schleef.org>
|
||||
Date: Wed, 1 Jul 2009 00:06:06 +0000 (-0700)
|
||||
Subject: build: don't install headers twice
|
||||
X-Git-Url: http://diracvideo.org/git?p=schroedinger.git;a=commitdiff_plain;h=1541481dc1dfa9293b0fbbc7634718b31d901340
|
||||
|
||||
build: don't install headers twice
|
||||
---
|
||||
|
||||
diff --git a/schroedinger/Makefile.am b/schroedinger/Makefile.am
|
||||
index 4c04b3b..af617bc 100644
|
||||
--- a/schroedinger/Makefile.am
|
||||
+++ b/schroedinger/Makefile.am
|
||||
@@ -57,9 +57,7 @@ pkginclude_HEADERS = \
|
||||
schroutils.h \
|
||||
schrovideoformat.h \
|
||||
schrovirtframe.h \
|
||||
- schrowavelet.h \
|
||||
- schrobitstream.h \
|
||||
- schromotion.h
|
||||
+ schrowavelet.h
|
||||
|
||||
nodist_pkginclude_HEADERS = \
|
||||
schroversion.h
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
--- schroedinger-1.0.7/gst/gstschrodec.c
|
||||
+++ schroedinger-1.0.7/gst/gstschrodec.c
|
||||
@@ -547,7 +547,7 @@
|
||||
|
||||
n_available -= 3;
|
||||
|
||||
- return gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
|
||||
+ return schro_gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
|
||||
offset, MIN (n, n_available - 3));
|
||||
}
|
||||
|
||||
--- schroedinger-1.0.7/gst/gstschroparse.c
|
||||
+++ schroedinger-1.0.7/gst/gstschroparse.c
|
||||
@@ -305,7 +305,7 @@
|
||||
|
||||
n_available -= 3;
|
||||
|
||||
- return gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
|
||||
+ return schro_gst_adapter_masked_scan_uint32 (adapter, 0x42424344, 0xffffffff,
|
||||
offset, MIN (n, n_available - 3));
|
||||
}
|
||||
|
||||
--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.c
|
||||
+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.c
|
||||
@@ -231,7 +231,7 @@
|
||||
|
||||
|
||||
int
|
||||
-gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
|
||||
+schro_gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
|
||||
guint32 pattern, guint32 mask, int offset, int n)
|
||||
{
|
||||
GSList *g;
|
||||
--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.h
|
||||
+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.h
|
||||
@@ -84,7 +84,7 @@
|
||||
GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
|
||||
int frame_number);
|
||||
|
||||
-int gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
|
||||
+int schro_gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
|
||||
guint32 pattern, guint32 mask, int offset, int n);
|
||||
GstBuffer *gst_adapter_get_buffer (GstAdapter *adapter);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,51 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 25 11:20:31 CET 2010 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 1.0.9:
|
||||
+ Orc: Complete conversion to Orc and removal of liboil
|
||||
dependency.
|
||||
+ Added a lot of orc code to make things faster. A lot faster.
|
||||
+ New motion vector generation, enabled by default.
|
||||
+ New CBR rate control, enabled by default.
|
||||
+ New scene change detection, enabled by default.
|
||||
+ Encoder went through several rounds of tuning, improving
|
||||
quality greatly.
|
||||
+ New encoder setting "force-profile". Allows easy access to one
|
||||
of three VC-2 profiles (vc2_low_delay, vc2_simple, vc2_main)
|
||||
for intermediate coding. Default is same as before: long-GOP
|
||||
Dirac.
|
||||
+ Improved lossless encoding. Works in concert with
|
||||
force-profile.
|
||||
- Changes from version 1.0.8:
|
||||
+ encoder: various performance enhancements
|
||||
+ Orc: More Orc conversion. The next release will likely require
|
||||
Orc to build.
|
||||
+ Add a fast path for 8x8 non-obmc motion blocks.
|
||||
+ encoder: Fix the queue-depth setting so that it actually works.
|
||||
+ Fix a bitstream conformance bug. Shows up as a psychadelic
|
||||
color pattern. Broken bitstreams should be uncommon, however,
|
||||
if the decoder detects a broken bitstream, it will be played
|
||||
correctly.
|
||||
+ Move GStreamer plugin to gst-plugins-bad
|
||||
+ encoder: Strictly enforce bit rate. Encoded pictures are cut
|
||||
off if they are larger than the available buffer.
|
||||
+ encoder: Change the backref engine to use an IPPPP...
|
||||
structure, using the last two pictures as references.
|
||||
- Drop schroedinger-am111.patch: fixed upstream.
|
||||
- Drop schroedinger-strict-aliasing.patch: fixed upstream.
|
||||
- Drop schroedinger-gstreamer-conflict.patch: the gstreamer plugin
|
||||
moved to gstreamer-plugins-bad.
|
||||
- Remove gstreamer-0_10-schroedinger subpackage and
|
||||
gstreamer-0_10-devel, gstreamer-0_10-plugins-base-devel
|
||||
BuildRequires.
|
||||
- Remove liboil-devel BuildRequires.
|
||||
- Add orc BuildRequires.
|
||||
- Fix self-obsoletion of schroedinger.
|
||||
- Changes schroedinger Requires to schroedinger-devel for devel
|
||||
pacakge.
|
||||
- Add schroedinger-1.0.9-fix-linking.patch to fix build, and call
|
||||
autoreconf -fi.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 27 16:29:11 UTC 2009 - mseben@novell.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package schroedinger (Version 1.0.7)
|
||||
# spec file for package schroedinger (Version 1.0.9)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 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,27 +17,22 @@
|
||||
|
||||
# norootforbuild
|
||||
|
||||
%define min_oil_version 0.3.16
|
||||
%define min_gst_version 0.10.19
|
||||
|
||||
Name: schroedinger
|
||||
Version: 1.0.9
|
||||
Release: 1
|
||||
License: GPLv2 ; LGPLv2.0 ; MPL .. ; MIT License (or similar)
|
||||
Summary: Library for decoding and encoding video in the Dirac format
|
||||
Url: http://schrodinger.sourceforge.net/
|
||||
Group: Productivity/Multimedia/Other
|
||||
License: GPL v2 only ; LGPL v2.0 only ; MPL .. ; MIT License (or similar)
|
||||
Version: 1.0.7
|
||||
Release: 3
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
# PATCH-FIX-UPSTREAM schroedinger-am111.patch taken from git, 154148 -- Do not install headers twice
|
||||
Patch0: schroedinger-am111.patch
|
||||
# PATCH-FIX-UPSTREAM schroedinger-strict-aliasing.patch 7831a506bc6714b3db40e31584e61ccaa71d78d9 sbrabec@suse.cz -- Fix strict aliasing.
|
||||
Patch1: %{name}-strict-aliasing.patch
|
||||
# PATCH-FIX-UPSTREAM schroedinger-gstreamer-conflict.patch rename function, which conflicts with gstreamer
|
||||
Patch2: %{name}-gstreamer-conflict.patch
|
||||
AutoReqProv: on
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: gstreamer-0_10-devel >= %{min_gst_version} gstreamer-0_10-plugins-base-devel >= %{min_gst_version} gtk-doc liboil-devel >= %{min_oil_version} pkg-config
|
||||
# PATCH-FIX-UPSTREAM schroedinger-1.0.9-fix-linking.patch vuntz@opensuse.org -- Taken from Mandriva
|
||||
Patch0: schroedinger-1.0.9-fix-linking.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: orc
|
||||
BuildRequires: pkg-config
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
The Schroedinger project implements portable libraries for the high
|
||||
@ -46,19 +41,12 @@ Dirac is a free and open source codec producing very high image quality
|
||||
video. The project produces two libraries in ANSI C89, one for decoding
|
||||
and one for encoding.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
David Schleef <ds@schleef.org>
|
||||
W.J. van der Laan <laanwj@gmail.com>
|
||||
|
||||
%package -n libschroedinger-1_0-0
|
||||
License: GPL v2 only ; LGPL v2.0 only ; MPL .. ; MIT License (or similar)
|
||||
License: GPLv2 ; LGPLv2.0 ; MPL .. ; MIT License (or similar)
|
||||
Summary: Library for decoding and encoding video in the Dirac format
|
||||
Group: Productivity/Multimedia/Other
|
||||
Provides: %{name} = %{version}
|
||||
Obsoletes: %{name} <= %{version}
|
||||
Obsoletes: %{name} < %{version}
|
||||
|
||||
%description -n libschroedinger-1_0-0
|
||||
The Schroedinger project implements portable libraries for the high
|
||||
@ -67,38 +55,13 @@ Dirac is a free and open source codec producing very high image quality
|
||||
video. The project produces two libraries in ANSI C89, one for decoding
|
||||
and one for encoding.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
David Schleef <ds@schleef.org>
|
||||
W.J. van der Laan <laanwj@gmail.com>
|
||||
|
||||
%package -n gstreamer-0_10-schroedinger
|
||||
License: GPL v2 only ; LGPL v2.0 only ; MPL .. ; MIT License (or similar)
|
||||
Summary: Library for decoding and encoding video in the Dirac format
|
||||
Group: Productivity/Multimedia/Other
|
||||
Requires: schroedinger = %{version} gstreamer-0_10 >= %{min_gst_version} gstreamer-0_10-plugins-base >= %{min_gst_version}
|
||||
|
||||
%description -n gstreamer-0_10-schroedinger
|
||||
The Schroedinger project implements portable libraries for the high
|
||||
quality Dirac video codec created by BBC Research and Development.
|
||||
Dirac is a free and open source codec producing very high image quality
|
||||
video. The project produces two libraries in ANSI C89, one for decoding
|
||||
and one for encoding.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
David Schleef <ds@schleef.org>
|
||||
W.J. van der Laan <laanwj@gmail.com>
|
||||
|
||||
%package devel
|
||||
License: GPL v2 only ; LGPL v2.0 only ; MPL .. ; MIT License (or similar)
|
||||
License: GPLv2 ; LGPLv2.0 ; MPL .. ; MIT License (or similar)
|
||||
Summary: Library for decoding and encoding video in the Dirac format
|
||||
Group: Development/Libraries/Other
|
||||
Requires: schroedinger = %{version} liboil-devel >= %{min_oil_version}
|
||||
Requires: libschroedinger-1_0-0 = %{version}
|
||||
Requires: glib2-devel
|
||||
Requires: orc
|
||||
|
||||
%description devel
|
||||
The Schroedinger project implements portable libraries for the high
|
||||
@ -107,18 +70,11 @@ Dirac is a free and open source codec producing very high image quality
|
||||
video. The project produces two libraries in ANSI C89, one for decoding
|
||||
and one for encoding.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
David Schleef <ds@schleef.org>
|
||||
W.J. van der Laan <laanwj@gmail.com>
|
||||
|
||||
%package doc
|
||||
License: GPL v2 only ; LGPL v2.0 only ; MPL .. ; MIT License (or similar)
|
||||
License: GPLv2 ; LGPLv2.0 ; MPL .. ; MIT License (or similar)
|
||||
Summary: Library for decoding and encoding video in the Dirac format
|
||||
Group: Productivity/Multimedia/Other
|
||||
Requires: schroedinger = %{version}
|
||||
Requires: schroedinger-devel = %{version}
|
||||
|
||||
%description doc
|
||||
The Schroedinger project implements portable libraries for the high
|
||||
@ -127,27 +83,19 @@ Dirac is a free and open source codec producing very high image quality
|
||||
video. The project produces two libraries in ANSI C89, one for decoding
|
||||
and one for encoding.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
David Schleef <ds@schleef.org>
|
||||
W.J. van der Laan <laanwj@gmail.com>
|
||||
|
||||
%prep
|
||||
%setup -q -n schroedinger-%{version}
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
%configure\
|
||||
--disable-static
|
||||
%{__make} %{?jobs:-j%jobs} docdir=%{_docdir}/%{name}
|
||||
|
||||
%install
|
||||
%makeinstall docdir=%{_docdir}/%{name}
|
||||
%{__install} -d $RPM_BUILD_ROOT%{_bindir}
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%clean
|
||||
#rm -rf $RPM_BUILD_ROOT
|
||||
@ -161,17 +109,11 @@ Authors:
|
||||
%doc AUTHORS COPYING COPYING.MIT COPYING.GPL COPYING.LGPL COPYING.MPL
|
||||
%{_libdir}/*.so.0*
|
||||
|
||||
%files -n gstreamer-0_10-schroedinger
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/gstreamer-0.10/*.so
|
||||
%exclude %{_libdir}/gstreamer-0.10/*.*a
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/schroedinger-1.0
|
||||
%{_includedir}/schroedinger-1.0/
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%exclude %{_libdir}/*.*a
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user