commit libdv for openSUSE:Factory
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.0 +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
+
+- 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 %{wi
commit libdv for openSUSE:Factory
Hello community,
here is the log from the commit of package libdv for openSUSE:Factory checked
in at 2015-03-16 06:56:17
Comparing /work/SRC/openSUSE:Factory/libdv (Old)
and /work/SRC/openSUSE:Factory/.libdv.new (New)
Package is "libdv"
Changes:
--- /work/SRC/openSUSE:Factory/libdv/libdv.changes 2015-01-30
11:00:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.libdv.new/libdv.changes 2015-03-16
06:56:19.0 +0100
@@ -1,0 +2,6 @@
+Fri Mar 6 17:30:12 UTC 2015 - mplus...@suse.com
+
+- Cleanup spec file with spec-cleaner
+- User url for source
+
+---
Old:
libdv-1.0.0.tar.bz2
New:
libdv-1.0.0.tar.gz
Other differences:
--
++ libdv.spec ++
--- /var/tmp/diff_new_pack.7B9mqF/_old 2015-03-16 06:56:20.0 +0100
+++ /var/tmp/diff_new_pack.7B9mqF/_new 2015-03-16 06:56:20.0 +0100
@@ -17,30 +17,14 @@
Name: libdv
-BuildRequires: SDL-devel
-BuildRequires: gtk2-devel
-BuildRequires: libXv-devel
-BuildRequires: libtool
-BuildRequires: popt-devel
-BuildRequires: xorg-x11-libX11-devel
-BuildRequires: xorg-x11-libXext-devel
-%if 0%{?suse_version} >= 1210
-BuildRequires: libv4l-devel >= 0.8.4
-%endif
-Url:http://libdv.sourceforge.net/
-# bug437293
-%ifarch ppc64
-Obsoletes: libdv-64bit
-%endif
-#
Version:1.0.0
Release:0
Summary:The Quasar DV Codec
License:GPL-2.0+
Group: Development/Libraries/Other
-Source: %name-%version.tar.bz2
+Url:http://libdv.sourceforge.net/
+Source:
http://sourceforge.net/projects/libdv/files/libdv/%{version}/%{name}-%{version}.tar.gz
Source2:baselibs.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
# PATCH-FIX-UPSTREAM libdv-gtk2.patch vu...@opensuse.org -- Patch from debian,
to use GTK+ 2.x
Patch1: libdv-gtk2.patch
Patch2: libdv.omit-excessive-warnings.patch
@@ -51,6 +35,22 @@
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: pkg-config
+BuildRequires: popt-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
The Quasar DV codec (libdv) is a software codec for DV video, the
@@ -62,13 +62,6 @@
There are two sample applications included with libdv: playdv and
encode.
-
-
-Authors:
-
-Erik Walthinsen
-Charles 'Buck' Krasic
-
%package -n libdv4
Summary:The Quasar DV Codec
Group: Development/Libraries/Other
@@ -88,17 +81,9 @@
There are two sample applications included with libdv: playdv and
encode.
-
-
-Authors:
-
-Erik Walthinsen
-Charles 'Buck' Krasic
-
%package devel
Summary:The Quasar DV codec
Group: Development/Libraries/Other
-Requires: glibc-devel
Requires: libdv4 = %{version}
# bug437293
%ifarch ppc64
@@ -116,13 +101,6 @@
There are two sample applications included with libdv: playdv and
encode.
-
-
-Authors:
-
-Erik Walthinsen
-Charles 'Buck' Krasic
-
%prep
%setup -q
%patch1 -p1
@@ -136,19 +114,20 @@
%patch7
%patch8 -p1
%patch9 -p1
+
%build
mkdir m4
autoreconf -fiv
CFLAGS="${RPM_OPT_FLAGS/O2/O3} -fomit-frame-pointer -fPIC -DPIC" \
-%configure --disable-static --with-pic --enable-sdl
-make %{?jobs:-j%jobs}
+%configure \
+ --disable-static \
+ --with-pic \
+ --enable-sdl
+make %{?_smp_mflags}
%install
-%makeinstall
-%{__rm} -f %{buildroot}%{_libdir}/*.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+find %{buildroot} -type f -name "*.la" -delete -print
%post -n libdv4 -p /sbin/ldconfig
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdv for openSUSE:Factory
Hello community,
here is the log from the commit of package libdv for openSUSE:Factory checked
in at 2015-01-30 11:00:14
Comparing /work/SRC/openSUSE:Factory/libdv (Old)
and /work/SRC/openSUSE:Factory/.libdv.new (New)
Package is "libdv"
Changes:
--- /work/SRC/openSUSE:Factory/libdv/libdv.changes 2013-04-23
15:10:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdv.new/libdv.changes 2015-01-30
11:00:16.0 +0100
@@ -1,0 +2,11 @@
+Tue Jan 27 19:59:19 UTC 2015 - crrodrig...@opensuse.org
+
+- libdv-endian.patch : Fix endiannnes tests to rely on the
+ compiler instead on the precence of C library definitions
+ This is more important for dv_types.h public header because
+ BYTE_ORDER is only defined when USE_MISC is.
+- libdv-visibility.patch: Export only the public API (dv.h)
+ private symbols are now hidden so the unprefixed ones
+ do not name-clash with other components of the system.
+
+---
New:
libdv-endian.patch
libdv-visibility.patch
Other differences:
--
++ libdv.spec ++
--- /var/tmp/diff_new_pack.lUMYau/_old 2015-01-30 11:00:17.0 +0100
+++ /var/tmp/diff_new_pack.lUMYau/_new 2015-01-30 11:00:17.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libdv
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -49,6 +49,8 @@
Patch5: libdv-1.0.0-textrels-selinux.patch
Patch6: libdv-v4l-2.6.38.patch
Patch7: libdv-fix-no-add-needed.patch
+Patch8: libdv-endian.patch
+Patch9: libdv-visibility.patch
%description
The Quasar DV codec (libdv) is a software codec for DV video, the
@@ -132,7 +134,8 @@
%patch6 -p1
%endif
%patch7
-
+%patch8 -p1
+%patch9 -p1
%build
mkdir m4
autoreconf -fiv
++ libdv-endian.patch ++
--- libdv-1.0.0.orig/libdv/bitstream.h
+++ libdv-1.0.0/libdv/bitstream.h
@@ -42,16 +42,6 @@
extern "C" {
#endif
-//My new and improved vego-matic endian swapping routine
-//(stolen from the kernel)
-#if (BYTE_ORDER == BIG_ENDIAN)
-#define swab32(x) (x)
-#else // LITTLE_ENDIAN
-#define swab32(x)\
-uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | \
- (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3]))
-#endif // LITTLE_ENDIAN
-
bitstream_t *_dv_bitstream_init();
void _dv_bitstream_set_fill_func(bitstream_t *bs,uint32_t (*next_function)
(uint8_t **,void *),void *priv);
void _dv_bitstream_next_buffer(bitstream_t * bs);
@@ -66,7 +56,7 @@ static void bitstream_next_word(bitstrea
if ((bs->buflen - bs->bufoffset) >=4 ) {
bs->next_word = *(uint32_t *)(bs->buf + bs->bufoffset);
-bs->next_word = swab32(bs->next_word);
+bs->next_word = htobe32(bs->next_word);
bs->next_bits = 32;
//fprintf(stderr,"next_word is %08x at %d\n",bs->next_word,bs->bufoffset);
bs->bufoffset += 4;
@@ -195,10 +185,10 @@ static inline void bitstream_flush_large
static inline void bitstream_seek_set(bitstream_t *bs, uint32_t offset) {
bs->bufoffset = ((offset & (~0x1f)) >> 5) << 2;
bs->current_word = *(uint32_t *)(bs->buf + bs->bufoffset);
- bs->current_word = swab32(bs->current_word);
+ bs->current_word = htobe32(bs->current_word);
bs->bufoffset += 4;
bs->next_word = *(uint32_t *)(bs->buf + bs->bufoffset);
- bs->next_word = swab32(bs->next_word);
+ bs->next_word = htobe32(bs->next_word);
bs->bufoffset += 4;
bs->bits_left = 32 - (offset & 0x1f);
bs->next_bits = 32;
--- libdv-1.0.0.orig/libdv/YUY2.c
+++ libdv-1.0.0/libdv/YUY2.c
@@ -275,7 +275,7 @@ dv_mb420_YUY2 (dv_macroblock_t *mb, uint
cb_frame++;
cr_frame++;
-#if (BYTE_ORDER == LITTLE_ENDIAN)
+#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
*pwyuv0++ = ylut[CLAMP(*(Ytmp0 + 0), -256, 511)];
*pwyuv0++ = cb;
*pwyuv0++ = ylut[CLAMP(*(Ytmp0 + 1), -256, 511)];
--- libdv-1.0.0.orig/libdv/dv_types.h
+++ libdv-1.0.0/libdv/dv_types.h
@@ -253,11 +253,13 @@ typedef struct {
counter examples. If we do find out there is one, we'll have to
fix it... */
-#if (BYTE_ORDER == LITTLE_ENDIAN)
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define LITTLE_ENDIAN_BITFIELD
-#else
+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#define BIG_ENDIAN_BITFIELD
-#endif /* (BYTE_ORDER == LITTLE_ENDIAN) */
+#else
+#error "cannot determine endianness"
+#endif
typedef struct {
#if defined(LITTLE_ENDIAN_BITFIELD)
++ libdv-visibility.patch ++
--- libdv-1.0.0.orig/libdv/Makefile.am
+++ libdv-1.0.0/libdv/Makefile.am
@@ -3,10 +3
commit libdv for openSUSE:Factory
Hello community,
here is the log from the commit of package libdv for openSUSE:Factory checked
in at 2013-04-23 15:10:47
Comparing /work/SRC/openSUSE:Factory/libdv (Old)
and /work/SRC/openSUSE:Factory/.libdv.new (New)
Package is "libdv", Maintainer is "jjo...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/libdv/libdv.changes 2011-11-14
12:03:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.libdv.new/libdv.changes 2013-04-23
15:10:49.0 +0200
@@ -1,0 +2,6 @@
+Mon Apr 22 17:42:04 UTC 2013 - dims...@opensuse.org
+
+- Add libXv-devel BuildRequires: this used to be pulled in by SDL,
+ but those dependencies were cleaned up.
+
+---
Other differences:
--
++ libdv.spec ++
--- /var/tmp/diff_new_pack.s8w9tO/_old 2013-04-23 15:10:52.0 +0200
+++ /var/tmp/diff_new_pack.s8w9tO/_new 2013-04-23 15:10:52.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libdv
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -15,28 +15,29 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: libdv
-BuildRequires: SDL-devel gtk2-devel popt-devel
-BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel
+BuildRequires: SDL-devel
+BuildRequires: gtk2-devel
+BuildRequires: libXv-devel
BuildRequires: libtool
+BuildRequires: popt-devel
+BuildRequires: xorg-x11-libX11-devel
+BuildRequires: xorg-x11-libXext-devel
%if 0%{?suse_version} >= 1210
BuildRequires: libv4l-devel >= 0.8.4
%endif
Url:http://libdv.sourceforge.net/
-License:GPL-2.0+
-Group: Development/Libraries/Other
-AutoReqProv:on
# bug437293
%ifarch ppc64
Obsoletes: libdv-64bit
%endif
#
Version:1.0.0
-Release:160
+Release:0
Summary:The Quasar DV Codec
+License:GPL-2.0+
+Group: Development/Libraries/Other
Source: %name-%version.tar.bz2
Source2:baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -67,9 +68,8 @@
Charles 'Buck' Krasic
%package -n libdv4
-License:GPL-2.0+
-Group: Development/Libraries/Other
Summary:The Quasar DV Codec
+Group: Development/Libraries/Other
# bug437293
%ifarch ppc64
Obsoletes: libdv-64bit
@@ -94,11 +94,10 @@
Charles 'Buck' Krasic
%package devel
-License:GPL-2.0+
-Group: Development/Libraries/Other
Summary:The Quasar DV codec
-Requires: libdv4 = %{version}
+Group: Development/Libraries/Other
Requires: glibc-devel
+Requires: libdv4 = %{version}
# bug437293
%ifarch ppc64
Obsoletes: libdv-devel-64bit
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdv for openSUSE:Factory
Hello community,
here is the log from the commit of package libdv for openSUSE:Factory checked
in at 2011-12-06 18:23:11
Comparing /work/SRC/openSUSE:Factory/libdv (Old)
and /work/SRC/openSUSE:Factory/.libdv.new (New)
Package is "libdv", Maintainer is "jjo...@suse.com"
Changes:
Other differences:
--
++ libdv.spec ++
--- /var/tmp/diff_new_pack.GX3bgH/_old 2011-12-06 18:40:45.0 +0100
+++ /var/tmp/diff_new_pack.GX3bgH/_new 2011-12-06 18:40:45.0 +0100
@@ -26,7 +26,7 @@
BuildRequires: libv4l-devel >= 0.8.4
%endif
Url:http://libdv.sourceforge.net/
-License:GPLv2+
+License:GPL-2.0+
Group: Development/Libraries/Other
AutoReqProv:on
# bug437293
@@ -67,7 +67,7 @@
Charles 'Buck' Krasic
%package -n libdv4
-License:GPLv2+
+License:GPL-2.0+
Group: Development/Libraries/Other
Summary:The Quasar DV Codec
# bug437293
@@ -94,7 +94,7 @@
Charles 'Buck' Krasic
%package devel
-License:GPLv2+
+License:GPL-2.0+
Group: Development/Libraries/Other
Summary:The Quasar DV codec
Requires: libdv4 = %{version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdv for openSUSE:Factory
Hello community,
here is the log from the commit of package libdv for openSUSE:Factory checked
in at 2011-11-14 12:03:48
Comparing /work/SRC/openSUSE:Factory/libdv (Old)
and /work/SRC/openSUSE:Factory/.libdv.new (New)
Package is "libdv", Maintainer is "jjo...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/libdv/libdv.changes 2011-09-23
02:08:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdv.new/libdv.changes 2011-11-14
12:03:49.0 +0100
@@ -1,0 +2,5 @@
+Sun Nov 13 09:15:36 UTC 2011 - co...@suse.com
+
+- add libtool as explicit buildrequire to avoid implicit dependency from
prjconf
+
+---
Other differences:
--
++ libdv.spec ++
--- /var/tmp/diff_new_pack.XXvWHT/_old 2011-11-14 12:03:51.0 +0100
+++ /var/tmp/diff_new_pack.XXvWHT/_new 2011-11-14 12:03:51.0 +0100
@@ -21,6 +21,7 @@
Name: libdv
BuildRequires: SDL-devel gtk2-devel popt-devel
BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel
+BuildRequires: libtool
%if 0%{?suse_version} >= 1210
BuildRequires: libv4l-devel >= 0.8.4
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdv for openSUSE:Factory
Hello community,
here is the log from the commit of package libdv for openSUSE:Factory
checked in at Mon Sep 5 16:35:07 CEST 2011.
--- libdv/libdv.changes 2011-07-08 16:45:04.0 +0200
+++ /mounts/work_src_done/STABLE/libdv/libdv.changes2011-09-03
22:33:01.0 +0200
@@ -1,0 +2,5 @@
+Sat Sep 3 20:32:28 UTC 2011 - crrodrig...@opensuse.org
+
+- Fix build with no-add-needed
+
+---
calling whatdependson for head-i586
New:
libdv-fix-no-add-needed.patch
Other differences:
--
++ libdv.spec ++
--- /var/tmp/diff_new_pack.kYUZO0/_old 2011-09-05 16:34:18.0 +0200
+++ /var/tmp/diff_new_pack.kYUZO0/_new 2011-09-05 16:34:18.0 +0200
@@ -19,7 +19,8 @@
Name: libdv
-BuildRequires: SDL-devel gtk2-devel libstdc++-devel popt-devel
+BuildRequires: SDL-devel gtk2-devel popt-devel
+BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel
%if 0%{?suse_version} >= 1210
BuildRequires: libv4l-devel >= 0.8.4
%endif
@@ -33,7 +34,7 @@
%endif
#
Version:1.0.0
-Release:158
+Release:160
Summary:The Quasar DV Codec
Source: %name-%version.tar.bz2
Source2:baselibs.conf
@@ -45,6 +46,7 @@
Patch4: libdv-filesizecheck.patch
Patch5: libdv-1.0.0-textrels-selinux.patch
Patch6: libdv-v4l-2.6.38.patch
+Patch7: libdv-fix-no-add-needed.patch
%description
The Quasar DV codec (libdv) is a software codec for DV video, the
@@ -129,8 +131,10 @@
%if 0%{?suse_version} >= 1210
%patch6 -p1
%endif
+%patch7
%build
+mkdir m4
autoreconf -fiv
CFLAGS="${RPM_OPT_FLAGS/O2/O3} -fomit-frame-pointer -fPIC -DPIC" \
%configure --disable-static --with-pic --enable-sdl
++ libdv-fix-no-add-needed.patch ++
--- playdv/Makefile.am.orig
+++ playdv/Makefile.am
@@ -15,4 +15,4 @@ bin_PROGRAMS= playdv
noinst_HEADERS= display.h oss.h
playdv_SOURCES= playdv.c display.c display.h oss.c
-playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
+playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
-lX11 -lXext
--- configure.ac.orig
+++ configure.ac
@@ -1,20 +1,22 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(libdv/parse.c)
+AC_INIT
+AC_CONFIG_SRCDIR([libdv/parse.c])
dnl AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(config.h)
-
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
RPM_RELEASE=1
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(libdv, 1.0.0)
AM_MAINTAINER_MODE
-AC_LIBTOOL_PICMODE(no)
dnl Checks for programs.
AC_SUBST(CFLAGS)
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
AM_PROG_AS
AS="${CC}" # stupid automake bug
@@ -25,9 +27,6 @@ if test "$GCC" = "yes"; then
CFLAGS="$CFLAGS -Wall"
fi
-AH_TEMPLATE([_GNU_SOURCE],
-[Define to enable GNU extensions of glibc, notably large file
support])
-
AH_TEMPLATE([YUV_420_USE_YV12],
[Define to 1 to use planar YUV format for 420 blocks in IEC PAL])
@@ -49,7 +48,6 @@ AH_TEMPLATE([HAVE_GTK],
AH_TEMPLATE([HAVE_LIBXV],
[Define if you have the `Xv' library (-lXv).])
-AC_DEFINE(_GNU_SOURCE)
AC_PROG_INSTALL
AC_PROG_LIBTOOL
--- Makefile.am.orig
+++ Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
if HAVE_GTK
gtk_subdirs = playdv
else
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdv for openSUSE:Factory
Hello community,
here is the log from the commit of package libdv for openSUSE:Factory
checked in at Thu Jul 14 10:13:12 CEST 2011.
--- libdv/libdv.changes 2010-06-04 17:48:25.0 +0200
+++ /mounts/work_src_done/STABLE/libdv/libdv.changes2011-07-08
16:45:04.0 +0200
@@ -1,0 +2,5 @@
+Fri Jul 8 14:41:23 UTC 2011 - idon...@novell.com
+
+- Apply libdv-v4l-2.6.38.patch on openSUSE >= 12.1 to enable v4l
+
+---
calling whatdependson for head-i586
New:
libdv-v4l-2.6.38.patch
Other differences:
--
++ libdv.spec ++
--- /var/tmp/diff_new_pack.4uN4t7/_old 2011-07-14 10:10:32.0 +0200
+++ /var/tmp/diff_new_pack.4uN4t7/_new 2011-07-14 10:10:32.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libdv (Version 1.0.0)
+# spec file for package libdv
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -20,6 +20,9 @@
Name: libdv
BuildRequires: SDL-devel gtk2-devel libstdc++-devel popt-devel
+%if 0%{?suse_version} >= 1210
+BuildRequires: libv4l-devel >= 0.8.4
+%endif
Url:http://libdv.sourceforge.net/
License:GPLv2+
Group: Development/Libraries/Other
@@ -30,7 +33,7 @@
%endif
#
Version:1.0.0
-Release:148
+Release:158
Summary:The Quasar DV Codec
Source: %name-%version.tar.bz2
Source2:baselibs.conf
@@ -41,6 +44,7 @@
Patch3: libdv.non_x86-reorder_block.patch
Patch4: libdv-filesizecheck.patch
Patch5: libdv-1.0.0-textrels-selinux.patch
+Patch6: libdv-v4l-2.6.38.patch
%description
The Quasar DV codec (libdv) is a software codec for DV video, the
@@ -122,6 +126,9 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%if 0%{?suse_version} >= 1210
+%patch6 -p1
+%endif
%build
autoreconf -fiv
++ libdv-v4l-2.6.38.patch ++
diff -ur libdv-1.0.0.orig/config.h.in libdv-1.0.0/config.h.in
--- libdv-1.0.0.orig/config.h.in2011-07-08 16:39:36.355076949 +0200
+++ libdv-1.0.0/config.h.in 2011-07-08 16:40:04.411076945 +0200
@@ -39,8 +39,8 @@
/* Define if you have the `Xv' library (-lXv). */
#undef HAVE_LIBXV
-/* Define to 1 if you have the header file. */
-#undef HAVE_LINUX_VIDEODEV_H
+/* Define to 1 if you have the header file. */
+#undef HAVE_LIBV4L1_VIDEODEV_H
/* Define to 1 if you have the header file. */
#undef HAVE_MACHINE_ENDIAN_H
diff -ur libdv-1.0.0.orig/configure.ac libdv-1.0.0/configure.ac
--- libdv-1.0.0.orig/configure.ac 2011-07-08 16:39:36.354076949 +0200
+++ libdv-1.0.0/configure.ac2011-07-08 16:40:20.147076945 +0200
@@ -230,7 +230,7 @@
dnl Checks for header files.
AC_PATH_X
AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h \
+AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h libv4l1-videodev.h
sys/soundcard.h \
endian.h machine/endian.h inttypes.h)
dnl Checks for typedefs, structures, and compiler characteristics.
diff -ur libdv-1.0.0.orig/libdv/enc_input.c libdv-1.0.0/libdv/enc_input.c
--- libdv-1.0.0.orig/libdv/enc_input.c 2011-07-08 16:39:36.357076949 +0200
+++ libdv-1.0.0/libdv/enc_input.c 2011-07-08 16:44:24.458076915 +0200
@@ -42,7 +42,7 @@
#include
#endif
-#if HAVE_LINUX_VIDEODEV_H
+#if HAVE_LIBV4L1_VIDEODEV_H
#define HAVE_DEV_VIDEO 1
#endif
@@ -50,7 +50,8 @@
#define _DEVICE_H_
#define _LINUX_TIME_H
#include
-#include
+#include
+#include
#include
#include
#include
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
