From e4dc32892a99525639d8bef065edb8398a4f802c3cbf0ea347d1256bec7aa439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 4 Jul 2017 13:31:56 +0000 Subject: [PATCH] Accepting request 508077 from home:scarabeus_iv:branches:multimedia:libs - Cleanu pwith spec-cleaner - Switch to upstream tarball instead of repacking - Update dependencies to match reality - Explicitely enable configuration switches - Disable docu building as they are kinda empty unless we would add latex and dot OBS-URL: https://build.opensuse.org/request/show/508077 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/dirac?expand=0&rev=35 --- dirac-1.0.2.tar.bz2 | 3 -- dirac-1.0.2.tar.gz | 3 ++ dirac.changes | 10 +++++ dirac.spec | 96 +++++++-------------------------------------- 4 files changed, 28 insertions(+), 84 deletions(-) delete mode 100644 dirac-1.0.2.tar.bz2 create mode 100644 dirac-1.0.2.tar.gz diff --git a/dirac-1.0.2.tar.bz2 b/dirac-1.0.2.tar.bz2 deleted file mode 100644 index e9afb28..0000000 --- a/dirac-1.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdeeafd27aa3db0594fb86cd9dd3c48c22607c416535722bc9fde1c52abb1cc8 -size 686238 diff --git a/dirac-1.0.2.tar.gz b/dirac-1.0.2.tar.gz new file mode 100644 index 0000000..c8e4bba --- /dev/null +++ b/dirac-1.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:816b16f18d235ff8ccd40d95fc5b4fad61ae47583e86607932929d70bf1f00fd +size 918366 diff --git a/dirac.changes b/dirac.changes index e85333d..5112abb 100644 --- a/dirac.changes +++ b/dirac.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 4 10:27:05 UTC 2017 - tchvatal@suse.com + +- Cleanu pwith spec-cleaner +- Switch to upstream tarball instead of repacking +- Update dependencies to match reality +- Explicitely enable configuration switches +- Disable docu building as they are kinda empty unless we would + add latex and dot + ------------------------------------------------------------------- Tue May 26 09:17:16 UTC 2015 - jkeil@suse.com diff --git a/dirac.spec b/dirac.spec index c800e3f..a49bc8e 100644 --- a/dirac.spec +++ b/dirac.spec @@ -1,7 +1,7 @@ # # spec file for package dirac # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,23 +19,19 @@ Name: dirac Version: 1.0.2 Release: 0 -Url: http://diracvideo.org/ Summary: The Dirac_Video Codec License: MPL-1.1 Group: Productivity/Multimedia/Video/Editors and Convertors -Source0: %{name}-%{version}.tar.bz2 +Url: https://sourceforge.net/projects/dirac/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: baselibs.conf Patch0: 0001-Fix-uninitialised-memory-read-that-causes-the-encode.patch Patch1: %{name}-%{version}-gcc45.patch -BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: graphviz-gd -BuildRequires: libcppunit-devel -BuildRequires: libstdc++-devel BuildRequires: libtool -BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig +BuildRequires: pkgconfig(cppunit) %description Dirac is an open source video codec. It uses a traditional hybrid video @@ -49,14 +45,6 @@ applications and standards. These cover the parameters that need to be set for the encoder to work, such as block sizes and temporal prediction structures, which must otherwise be set by hand. -Dirac is intended to develop into real coding and decoding software, -capable of plugging into video processing applications and media -players that need compression. It is intended to develop into a simple -set of reliable but effective coding tools that work over a wide -variety of content and formats, using well-understood compression -techniques, in a clear and accessible software structure. It is not -intended as a demonstration or reference coder. - %package -n libdirac_decoder0 Summary: Dirac Video Codec Decoder Library Group: System/Libraries @@ -73,14 +61,6 @@ applications and standards. These cover the parameters that need to be set for the encoder to work, such as block sizes and temporal prediction structures, which must otherwise be set by hand. -Dirac is intended to develop into real coding and decoding software, -capable of plugging into video processing applications and media -players that need compression. It is intended to develop into a simple -set of reliable but effective coding tools that work over a wide -variety of content and formats, using well-understood compression -techniques, in a clear and accessible software structure. It is not -intended as a demonstration or reference coder. - %package -n libdirac_encoder0 Summary: Dirac Video Codec Encoder Library Group: System/Libraries @@ -97,14 +77,6 @@ applications and standards. These cover the parameters that need to be set for the encoder to work, such as block sizes and temporal prediction structures, which must otherwise be set by hand. -Dirac is intended to develop into real coding and decoding software, -capable of plugging into video processing applications and media -players that need compression. It is intended to develop into a simple -set of reliable but effective coding tools that work over a wide -variety of content and formats, using well-understood compression -techniques, in a clear and accessible software structure. It is not -intended as a demonstration or reference coder. - %package devel Summary: Development Files for Dirac Video Codec Group: Development/Libraries/C and C++ @@ -125,25 +97,6 @@ applications and standards. These cover the parameters that need to be set for the encoder to work, such as block sizes and temporal prediction structures, which must otherwise be set by hand. -Dirac is intended to develop into real coding and decoding software, -capable of plugging into video processing applications and media -players that need compression. It is intended to develop into a simple -set of reliable but effective coding tools that work over a wide -variety of content and formats, using well-understood compression -techniques, in a clear and accessible software structure. It is not -intended as a demonstration or reference coder. - -%package doc -Summary: Dirac Video Codec api documentation -Group: Documentation/HTML -%if 0%{?suse_version} > 1110 -BuildArch: noarch -%endif - -%description doc -This package provides the api reference documentation for using dirac libraries -in your program. - %prep %setup -q %patch0 -p1 @@ -152,58 +105,39 @@ in your program. sed -i 's/-Werror//' configure.ac %build -# fix build in disabling as-needed -export SUSE_ASNEEDED=0 -ACLOCAL="aclocal -I m4" autoreconf -f -i -%if %suse_version == 1100 -%ifarch x86_64 -export CXXFLAGS="$RPM_OPT_FLAGS -O0" -%endif -%endif -%configure\ +ACLOCAL="aclocal -I m4" autoreconf -fvi +%configure \ + --disable-silent-rules \ --disable-static \ - --docdir=%{_docdir}/packages/%{name} + --docdir=%{_docdir}/packages/%{name} \ + --enable-mmx \ + --enable-overlay make %{?_smp_mflags} -#htmldir=%{_docdir}/%{name}/code/api_html %install -%makeinstall htmldir=%{_docdir}/%{name}/code/api_html -%{__rm} -f %{buildroot}%{_libdir}/*.la -%{__cp} -a AUTHORS COPYING ChangeLog NEWS README TODO %{buildroot}%{_docdir}/%{name}/ +%make_install htmldir=%{_docdir}/%{name}/code/api_html +# remove the docs we want with main pkg +find %{buildroot} -type f -name "*.la" -delete -print %fdupes %{buildroot}%{_docdir}/%{name} %post -n libdirac_decoder0 -p /sbin/ldconfig - %postun -n libdirac_decoder0 -p /sbin/ldconfig - %post -n libdirac_encoder0 -p /sbin/ldconfig - %postun -n libdirac_encoder0 -p /sbin/ldconfig %files -%defattr (-, root, root) -#%%doc AUTHORS COPYING ChangeLog NEWS README TODO -#%%doc %{_docdir}/%{name}/[ACNRT]* +%doc AUTHORS COPYING ChangeLog NEWS README TODO %{_bindir}/* %files -n libdirac_decoder0 -%defattr (-, root, root) %{_libdir}/libdirac_decoder.so.0* %files -n libdirac_encoder0 -%defattr (-, root, root) %{_libdir}/libdirac_encoder.so.0* %files devel -%defattr (-, root, root) -#%%doc %{_docdir}/%{name}/[ACNRT]* %{_libdir}/*.so -#%{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc %{_includedir}/%{name} -%files doc -%defattr (-, root, root) -%doc %{_docdir}/%{name} - %changelog