From 8f6debc7a7eeb304cc603d61cdc332e81f7a3371ef4613ee94a241eb48fd1859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 14:34:48 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main libavc1394 revision 890d31d9a8742b3bed6acb4b86d61396 --- .gitattributes | 23 ++++ baselibs.conf | 6 + libavc-fix-symbolexports.patch | 24 ++++ libavc1394-0.5.4.tar.gz | 3 + libavc1394.changes | 154 +++++++++++++++++++++++ libavc1394.no-mkrfc2734.patch | 29 +++++ libavc1394.raw1394_set_fcp_handler.patch | 21 ++++ libavc1394.spec | 110 ++++++++++++++++ 8 files changed, 370 insertions(+) create mode 100644 .gitattributes create mode 100644 baselibs.conf create mode 100644 libavc-fix-symbolexports.patch create mode 100644 libavc1394-0.5.4.tar.gz create mode 100644 libavc1394.changes create mode 100644 libavc1394.no-mkrfc2734.patch create mode 100644 libavc1394.raw1394_set_fcp_handler.patch create mode 100644 libavc1394.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..5417727 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,6 @@ +libavc1394-0 + obsoletes "libavc1394- <= " + provides "libavc1394- = " +libavc1394-devel + requires -libavc1394- + requires "libavc1394-0- = " diff --git a/libavc-fix-symbolexports.patch b/libavc-fix-symbolexports.patch new file mode 100644 index 0000000..751608b --- /dev/null +++ b/libavc-fix-symbolexports.patch @@ -0,0 +1,24 @@ +Index: libavc1394-0.5.4/librom1394/Makefile.am +=================================================================== +--- libavc1394-0.5.4.orig/librom1394/Makefile.am ++++ libavc1394-0.5.4/librom1394/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + lib_LTLIBRARIES = librom1394.la +-librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \ ++librom1394_la_LDFLAGS = @LIBRAW1394_LIBS@ -export-symbols-regex '^rom1394_' \ + -version-info @lt_major@:@lt_revision@:@lt_age@ -lm + librom1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo + librom1394_la_SOURCES = \ +Index: libavc1394-0.5.4/libavc1394/Makefile.am +=================================================================== +--- libavc1394-0.5.4.orig/libavc1394/Makefile.am ++++ libavc1394-0.5.4/libavc1394/Makefile.am +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + lib_LTLIBRARIES = libavc1394.la +-libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ \ ++libavc1394_la_LDFLAGS = @LIBRAW1394_LIBS@ -export-symbols-regex '^avc1394_' \ + -version-info @lt_major@:@lt_revision@:@lt_age@ + libavc1394_la_LIBADD = $(top_builddir)/common/raw1394util.lo + libavc1394_la_SOURCES = \ diff --git a/libavc1394-0.5.4.tar.gz b/libavc1394-0.5.4.tar.gz new file mode 100644 index 0000000..8821682 --- /dev/null +++ b/libavc1394-0.5.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cb1ff09506ae911ca9860bef4af08c2403f3e131f6c913a2cbd6ddca4215b53 +size 341679 diff --git a/libavc1394.changes b/libavc1394.changes new file mode 100644 index 0000000..44a3c7f --- /dev/null +++ b/libavc1394.changes @@ -0,0 +1,154 @@ +------------------------------------------------------------------- +Wed Aug 14 08:23:26 UTC 2019 - Tomáš Chvátal + +- Freshen a bit + +------------------------------------------------------------------- +Sat Nov 14 22:10:12 UTC 2015 - jengelh@inai.de + +- Update groups and trim descriptions. +- Remove redundant --with-pic; shared libraries always get it + anyway. +- Name the utility package -tools as with many other pkgs. + Set its license. + +------------------------------------------------------------------- +Sat Mar 21 07:35:05 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Use url for source +- Remove obsolete ppc provides/obsoletes + +------------------------------------------------------------------- +Thu Sep 4 16:55:05 UTC 2014 - crrodriguez@opensuse.org + +- Just like the companion librawxxx, this package has screwed + symbol names, fix them by exporting only the public API. + (libavc-fix-symbolexports.patch) + +------------------------------------------------------------------- +Fri Dec 2 15:47:56 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Sun Oct 3 16:31:50 UTC 2010 - davejplater@gmail.com + +- Update to version 0.5.4 +- Upstream changes : + panelctl.[c1]: apply patch from Jerry Fiddler to add options --guid, + --specid, --swversion, and --commands. + +------------------------------------------------------------------- +Fri Dec 18 13:25:56 CET 2009 - jengelh@medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- +Fri Jan 9 01:46:50 CET 2009 - crrodriguez@suse.de + +- remove static libraries and "la" files + +------------------------------------------------------------------- +Wed Dec 10 12:34:56 CET 2008 - olh@suse.de + +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) + +------------------------------------------------------------------- +Thu Dec 4 12:34:56 CET 2008 - olh@suse.de + +- obsolete old -XXbit packages (bnc#437293) + +------------------------------------------------------------------- +Mon Oct 6 09:54:28 CEST 2008 - olh@suse.de + +- fix ordered comparison of pointer with integer zero (bnc#431913) + +------------------------------------------------------------------- +Wed May 21 19:15:15 CEST 2008 - cthiel@suse.de + +- fix baselibs.conf + +------------------------------------------------------------------- +Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de + +- added baselibs.conf file to build xxbit packages + for multilib support + +------------------------------------------------------------------- +Sat Aug 4 16:48:59 CEST 2007 - olh@suse.de + +- remove mkrfc2734 for 2.4 kernel + split libavc1394-0 package which contains only libraries + +------------------------------------------------------------------- +Wed Jul 19 17:02:08 CEST 2006 - olh@suse.de + +- update to 0.5.3: + bugfixes + new avc1394_transaction_block2() function that returns the length + of the response. + Panel subunit indirect mode constants added to header. + new panelctl utility based upon 6200ch and 6200cmd from MythTV developers. + +------------------------------------------------------------------- +Wed Jan 25 21:37:23 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Mon Sep 26 22:49:58 CEST 2005 - mls@suse.de + +- make devel package require base package + +------------------------------------------------------------------- +Sat Jul 2 11:36:28 CEST 2005 - olh@suse.de + +- package all *.so files + +------------------------------------------------------------------- +Fri Jul 1 15:51:51 CEST 2005 - olh@suse.de + +- update to 0.5.1 + +------------------------------------------------------------------- +Sun Jan 11 09:45:16 CET 2004 - adrian@suse.de + +- add %run_ldconfig + +------------------------------------------------------------------- +Thu Nov 13 13:40:51 CET 2003 - sf@suse.de + +- update to 0.4.1 + +------------------------------------------------------------------- +Thu Jun 12 16:25:09 CEST 2003 - coolo@suse.de + +- fixing file list + +------------------------------------------------------------------- +Thu Dec 12 09:44:55 CET 2002 - coolo@suse.de + +- actually adding the patch may help (noone noticed? :) + +------------------------------------------------------------------- +Wed Dec 11 11:36:03 CET 2002 - coolo@suse.de + +- removed undefined symbols from the libraries + +------------------------------------------------------------------- +Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Fri Jul 12 11:02:06 CEST 2002 - meissner@suse.de + +- rerurn auto* tools. + +------------------------------------------------------------------- +Tue Mar 26 10:20:18 CET 2002 - sf@suse.de + +- initial version 0.3.1 + diff --git a/libavc1394.no-mkrfc2734.patch b/libavc1394.no-mkrfc2734.patch new file mode 100644 index 0000000..e838e9b --- /dev/null +++ b/libavc1394.no-mkrfc2734.patch @@ -0,0 +1,29 @@ +Tool is not needed for kernel 2.6 +--- + test/Makefile.am | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +Index: libavc1394-0.5.4/test/Makefile.am +=================================================================== +--- libavc1394-0.5.4.orig/test/Makefile.am ++++ libavc1394-0.5.4/test/Makefile.am +@@ -1,7 +1,7 @@ + MAINTAINERCLEANFILES = Makefile.in +-bin_PROGRAMS = dvcont mkrfc2734 panelctl ++bin_PROGRAMS = dvcont panelctl + noinst_PROGRAMS = romtest setrom avc_vcr +-man_MANS = dvcont.1 mkrfc2734.1 panelctl.1 ++man_MANS = dvcont.1 panelctl.1 + EXTRA_DIST = $(man_MANS) + + dvcont_SOURCES = dvcont.c +@@ -12,9 +12,6 @@ romtest_SOURCES = romtest.c + romtest_LDADD = ../librom1394/librom1394.la \ + @LIBRAW1394_LIBS@ + +-mkrfc2734_SOURCES = mkrfc2734.c +-mkrfc2734_LDADD = ../librom1394/librom1394.la \ +- @LIBRAW1394_LIBS@ + + setrom_SOURCES = setrom.c + setrom_LDADD = ../librom1394/librom1394.la \ diff --git a/libavc1394.raw1394_set_fcp_handler.patch b/libavc1394.raw1394_set_fcp_handler.patch new file mode 100644 index 0000000..1148c6f --- /dev/null +++ b/libavc1394.raw1394_set_fcp_handler.patch @@ -0,0 +1,21 @@ +Bug 431913 - libavc1394-0.5.3-104: ordered comparison of pointer with integer zero + +avc1394_simple.c:552: warning: ordered comparison of pointer with integer zero +--- + libavc1394/avc1394_simple.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: libavc1394-0.5.4/libavc1394/avc1394_simple.c +=================================================================== +--- libavc1394-0.5.4.orig/libavc1394/avc1394_simple.c ++++ libavc1394-0.5.4/libavc1394/avc1394_simple.c +@@ -549,8 +549,7 @@ avc1394_init_target( raw1394handle_t han + if (cmd_handler == NULL) + return -1; + g_command_handler = cmd_handler; +- if (raw1394_set_fcp_handler( handle, target_fcp_handler ) < 0) +- return -1; ++ raw1394_set_fcp_handler( handle, target_fcp_handler ); + return raw1394_start_fcp_listen( handle ); + } + diff --git a/libavc1394.spec b/libavc1394.spec new file mode 100644 index 0000000..9bf047e --- /dev/null +++ b/libavc1394.spec @@ -0,0 +1,110 @@ +# +# spec file for package libavc1394 +# +# Copyright (c) 2019 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: libavc1394 +Version: 0.5.4 +Release: 0 +Summary: Programming Interface to the AV/C Specification +License: LGPL-2.1-or-later AND GPL-2.0-or-later +Group: System/Libraries +URL: https://sourceforge.net/projects/libavc1394/ +Source: https://downloads.sf.net/libavc1394/%{name}-%{version}.tar.gz +Source2: baselibs.conf +Patch0: libavc1394.no-mkrfc2734.patch +Patch1: libavc1394.raw1394_set_fcp_handler.patch +Patch2: libavc-fix-symbolexports.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libraw1394-devel +BuildRequires: libtool +BuildRequires: pkgconfig + +%description +libavc1394 is a programming interface to the AV/C (Audio/Video +Control) specification. Applications use the library to control the +tape transport mechanism on DV camcorders. However, there are many +devices and functions of devices that can be controlled via AV/C. + +%package 0 +Summary: Programming Interface to the AV/C Specification +License: LGPL-2.1-or-later AND GPL-2.0-or-later +Group: System/Libraries + +%description 0 +libavc1394 is a programming interface to the AV/C (Audio/Video +Control) specification. Applications use the library to control the +tape transport mechanism on DV camcorders. However, there are many +devices and functions of devices that can be controlled via AV/C. + +%package devel +Summary: Development files for libavc1394, a library to the AV/C specification +License: LGPL-2.1-or-later AND GPL-2.0-or-later +Group: Development/Libraries/C and C++ +Requires: libavc1394-0 = %{version} + +%description devel +libavc1394 is a programming interface to the AV/C (Audio/Video +Control) specification. Applications use the library to control the +tape transport mechanism on DV camcorders. However, there are many +devices and functions of devices that can be controlled via AV/C. + +%package tools +Summary: Utilities for AV/C 1394 +# added on 2015-11-14 +License: GPL-2.0-or-later +Group: Hardware/Other +Obsoletes: %{name} < %{version}-%{release} +Provides: %{name} = %{version}-%{release} + +%description tools +Command-line utilities to inspect and control AV/C hardware. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +autoreconf -fvi +%configure --disable-static +make %{?_smp_mflags} + +%install +%make_install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print + +%post 0 -p /sbin/ldconfig +%postun 0 -p /sbin/ldconfig + +%files tools +%license COPYING +%doc README AUTHORS +%{_mandir}/man1/* +%{_bindir}/* + +%files 0 +%{_libdir}/libavc1394.so.* +%{_libdir}/librom1394.so.* + +%files devel +%{_libdir}/*.so +%{_includedir}/libavc1394 +%{_libdir}/pkgconfig/*.pc + +%changelog