Hello community, here is the log from the commit of package libdv for openSUSE:Factory checked in at 2020-02-14 16:30:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdv (Old) and /work/SRC/openSUSE:Factory/.libdv.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdv" Fri Feb 14 16:30:12 2020 rev:29 rq:770573 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libdv/libdv.changes 2015-03-16 06:56:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdv.new.26092/libdv.changes 2020-02-14 16:30:21.003352690 +0100 @@ -1,0 +2,7 @@ +Mon Feb 3 13:09:39 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Cleanup spec file, remove obsolete conditionals. +- Build playdv as a separate package, removes X11, SDL1 and gtk2 + build dependencies from the library. + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdv.spec ++++++ --- /var/tmp/diff_new_pack.VI2j81/_old 2020-02-14 16:30:22.203353341 +0100 +++ /var/tmp/diff_new_pack.VI2j81/_new 2020-02-14 16:30:22.223353352 +0100 @@ -1,7 +1,7 @@ # # spec file for package libdv # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,30 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -Name: libdv +%global flavor @BUILD_FLAVOR@%{nil} + +%if "%{flavor}" == "playdv" +%bcond_without playdv +%define tools_description playdv sample application +%define psuffix -playdv +%else +%bcond_with playdv +%define tools_description encodedv, dubdv and dvconnect tools +%endif +%define sname libdv + +Name: libdv%{?psuffix} Version: 1.0.0 Release: 0 Summary: The Quasar DV Codec -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/Other -Url: http://libdv.sourceforge.net/ -Source: http://sourceforge.net/projects/libdv/files/libdv/%{version}/%{name}-%{version}.tar.gz +URL: http://libdv.sourceforge.net/ +Source: http://sourceforge.net/projects/libdv/files/libdv/%{version}/%{sname}-%{version}.tar.gz Source2: baselibs.conf # PATCH-FIX-UPSTREAM libdv-gtk2.patch vu...@opensuse.org -- Patch from debian, to use GTK+ 2.x Patch1: libdv-gtk2.patch @@ -35,21 +47,16 @@ Patch7: libdv-fix-no-add-needed.patch Patch8: libdv-endian.patch Patch9: libdv-visibility.patch -BuildRequires: SDL-devel -BuildRequires: gtk2-devel -BuildRequires: libXv-devel BuildRequires: libtool +BuildRequires: libv4l-devel >= 0.8.4 BuildRequires: pkg-config BuildRequires: popt-devel +%if %{with playdv} +BuildRequires: SDL-devel +BuildRequires: gtk2-devel +BuildRequires: libXv-devel BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1210 -BuildRequires: libv4l-devel >= 0.8.4 -%endif -# bug437293 -%ifarch ppc64 -Obsoletes: libdv-64bit %endif %description @@ -59,17 +66,11 @@ developed according to the official standards for DV video: IEC 61834 and SMPTE 314M. -There are two sample applications included with libdv: playdv and -encode. +This package contains the %{tools_description}. %package -n libdv4 Summary: The Quasar DV Codec Group: Development/Libraries/Other -# bug437293 -%ifarch ppc64 -Obsoletes: libdv-64bit -%endif -# %description -n libdv4 The Quasar DV codec (libdv) is a software codec for DV video, the @@ -78,18 +79,10 @@ developed according to the official standards for DV video: IEC 61834 and SMPTE 314M. -There are two sample applications included with libdv: playdv and -encode. - %package devel Summary: The Quasar DV codec Group: Development/Libraries/Other Requires: libdv4 = %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: libdv-devel-64bit -%endif -# %description devel The Quasar DV codec (libdv) is a software codec for DV video, the @@ -98,36 +91,48 @@ developed according to the official standards for DV video: IEC 61834 and SMPTE 314M. -There are two sample applications included with libdv: playdv and -encode. %prep -%setup -q +%setup -q -n %{sname}-%{version} %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 -%if 0%{?suse_version} >= 1210 %patch6 -p1 -%endif %patch7 %patch8 -p1 %patch9 -p1 %build mkdir m4 +%if %{without playdv} +# Dummy macro for ignored SDL, autoreconf fails otherwise +echo "AC_DEFUN([AM_PATH_SDL], [true])" >> m4/dummy_sdl.m4 +%endif + autoreconf -fiv -CFLAGS="${RPM_OPT_FLAGS/O2/O3} -fomit-frame-pointer -fPIC -DPIC" \ +export CFLAGS="${RPM_OPT_FLAGS/O2/O3} -fomit-frame-pointer -fPIC -DPIC" +export LDFLAGS="-pie" %configure \ --disable-static \ --with-pic \ - --enable-sdl +%if %{with playdv} + --enable-sdl \ +%else + --disable-sdl \ + --disable-gtk \ +%endif + %{nil} make %{?_smp_mflags} %install +%if "%{flavor}" == "playdv" +make DESTDIR=%{buildroot} -C playdv install %{?_smp_mflags} +%else make DESTDIR=%{buildroot} install %{?_smp_mflags} find %{buildroot} -type f -name "*.la" -delete -print +%endif %post -n libdv4 -p /sbin/ldconfig @@ -138,6 +143,7 @@ %{_bindir}/* %doc %{_mandir}/man1/*.1.gz +%if "%{flavor}" != "playdv" %files -n libdv4 %defattr(-,root,root) %{_libdir}/libdv.so.* @@ -147,5 +153,6 @@ %{_includedir}/libdv %{_libdir}/libdv.so %{_libdir}/pkgconfig/libdv.pc +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>playdv</package> </multibuild> ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.VI2j81/_old 2020-02-14 16:30:22.387353441 +0100 +++ /var/tmp/diff_new_pack.VI2j81/_new 2020-02-14 16:30:22.391353443 +0100 @@ -1,2 +1 @@ -libdv libdv4
