diff --git a/baselibs.conf b/baselibs.conf index ff7c244..f407708 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,3 @@ -libraw1394 libraw1394-11 obsoletes "libraw1394- <= " provides "libraw1394- = " diff --git a/libraw1394-2.1.0.tar.xz b/libraw1394-2.1.0.tar.xz deleted file mode 100644 index c921679..0000000 --- a/libraw1394-2.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b3126d8158d156de9da2ff4d861c47857acc4318a7ac260258015a22071964f -size 291456 diff --git a/libraw1394-2.1.1.tar.sign b/libraw1394-2.1.1.tar.sign new file mode 100644 index 0000000..c4f013e --- /dev/null +++ b/libraw1394-2.1.1.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAABAgAGBQJVP/7BAAoJEHnzb7JUXXnQxS8P/iQ4DJ0tpClDNLvWaLuvR1g7 +w38hqQm6l1jO7Mvy0OdIY047kwkWOK4G2a+Fb6r3KRyyRvUD5eJNaJypjEJHvDVV +CAP9nJ/eZXnUwrWyZcoet3JyzD3K5bG415zzU/lE8c6jB0xEfxhrBN/CwipI8p4X +Z74t3cE7Sns9FdDBer038W1LKaRyK7PvU2qsGQjol50gOfjYmD7dpbzfPrbfoX0Q +EuttAu6VUGLtLMTITsA5dND5PjA0Eazc6CdLaQKJy9+6K0xV/Tnt7EVL1T+by+Y6 +rzfrQ0JUWOJ5R1dO9poxXcVtL5pJleQ1gwlXSg4Z2UlKRCq4vBRnFoclMrVzIgvt +eYLcEJgiwPDIUtMdspwGhyifsMktzuGAhqG1arEJE5i4++ZFdhPx3D1A2AubN5Ok +E1CcmrNp76rEqbTGTOxncn/QMgcZ7SMhku5THY+VBYfKkHRpBBn9pEg2VtTfsRSQ +1Eou/Xvsu/p3YvB8Eq2bUImS4mqfFIvMVM1shBCfGErd76T/QcVuuGko0M1+CaHB +BP24/JZy347G814z5Ba6Svxd0++vatxZLNDW9FWiOuETQSEgyM9iYDSYRfEjxfSy +vw1rtQ251P85govvwXG3Fe+1qEgVadZDTTI+BvbHlJs9mRYzficxbbuUEGNHqxfi +O8kMr9ajegZYJ44plGxo +=xvJk +-----END PGP SIGNATURE----- diff --git a/libraw1394-2.1.1.tar.xz b/libraw1394-2.1.1.tar.xz new file mode 100644 index 0000000..8df7fa9 --- /dev/null +++ b/libraw1394-2.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bab9780189f9d1eb4e973df12679c04f979c21e024240fc98e536ff5b680ee9 +size 309396 diff --git a/libraw1394-exports.patch b/libraw1394-exports.patch index 2778cfe..7400081 100644 --- a/libraw1394-exports.patch +++ b/libraw1394-exports.patch @@ -1,11 +1,16 @@ ---- libraw1394-2.1.0.orig/src/Makefile.am -+++ libraw1394-2.1.0/src/Makefile.am -@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in - +--- + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +Index: libraw1394-2.1.1/src/Makefile.am +=================================================================== +--- libraw1394-2.1.1.orig/src/Makefile.am ++++ libraw1394-2.1.1/src/Makefile.am +@@ -5,6 +5,7 @@ MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libraw1394.la --libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ -+libraw1394_la_LDFLAGS = -export-symbols-regex '^raw1394_' -no-undefined -version-info @lt_major@:@lt_revision@:@lt_age@ + libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ ++libraw1394_la_LDFLAGS += -export-symbols-regex '^raw1394_' -no-undefined libraw1394_la_SOURCES = \ main.c \ diff --git a/libraw1394.changes b/libraw1394.changes index a572941..ff477e3 100644 --- a/libraw1394.changes +++ b/libraw1394.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat Nov 14 15:14:55 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 2.2.1 +* Align fw_handle buffer for 64-bit access +* Prevent requests for previously provided ISO TX packets +* Save and restore errno in raw1394_new_handle{,_on_port} for + legacy applications +- Store and use gpg key to verify. Trim description and update it + for the contemporary Firewire stack. +- Make libraw1394-exports.patch simpler by avoiding ^- lines. +- Drop redundant --with-pic; it is only used for static libs (which + we do not build), and always on anyway for shared libraires. +- Name the utility package -tools as with many other pkgs. +- Remove non-library packages from baselibs.conf. + ------------------------------------------------------------------- Sat Mar 21 07:56:45 UTC 2015 - mpluskal@suse.com diff --git a/libraw1394.keyring b/libraw1394.keyring new file mode 100644 index 0000000..f8fe0b4 --- /dev/null +++ b/libraw1394.keyring @@ -0,0 +1,56 @@ +pub 4096R/0x79F36FB2545D79D0 2011-10-21 + Key fingerprint = 955C 0098 E5C4 6EF9 A152 4814 79F3 6FB2 545D 79D0 +uid [ unknown] Stefan Richter +sub 4096R/0x8243C1F5D30851B0 2011-10-21 + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +8fwWIvw2x3j0 +=iBf9 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libraw1394.spec b/libraw1394.spec index 601e76b..20b9df9 100644 --- a/libraw1394.spec +++ b/libraw1394.spec @@ -17,74 +17,74 @@ Name: libraw1394 -Version: 2.1.0 +Version: 2.1.1 Release: 0 -Summary: A Firewire Interface +Summary: A Firewire Interface library License: LGPL-2.1+ -Group: System/Kernel +Group: Development/Libraries/C and C++ Url: http://www.dennedy.org/libraw1394/ -Source0: http://www.kernel.org/pub/linux/libs/ieee1394/%{name}-%{version}.tar.xz -Source1: baselibs.conf + +#Git-Web: https://git.kernel.org/cgit/libs/ieee1394/libraw1394.git/ +#Git-Clone: git://git.kernel.org/pub/scm/libs/ieee1394/libraw1394 +Source: https://www.kernel.org/pub/linux/libs/ieee1394/%name-%version.tar.xz +Source2: https://www.kernel.org/pub/linux/libs/ieee1394/%name-%version.tar.sign +Source3: %name.keyring +Source4: baselibs.conf Patch0: libraw1394.no-isodump.patch Patch1: libraw1394-exports.patch BuildRequires: libtool BuildRequires: openjade-devel BuildRequires: pkg-config +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The Linux kernel's IEEE 1394 subsystem provides access to the raw 1394 -bus through the raw1394 module. This includes the standard 1394 -transactions (read, write, lock) on the active side, isochronous -stream receiving and sending and dumps of data written to the -FCP_COMMAND and FCP_RESPONSE registers. raw1394 uses a character -device to communicate to user programs using a special protocol. - -libraw1394 was created with the intent to hide that protocol from -applications so that - -- the protocol has to be implemented correctly only once. - -- all work can be done using easy to understand functions instead of - handling a complicated command structure. - -- only libraw1394 has to be changed when raw1394's interface changes. - -Maintainer: Dan Dennedy - -Original author: Andreas Bombe - or - -Contributors: -Manfred Weihs -Christian Toegel -Dan Maas -Ben Collins -Pieter Palmers +libraw1394 provides direct access to the connected 1394 buses to +userspace. Through this library, applications can directly send to +and receive from other nodes without requiring a kernel driver for +the protocol in question. %package 11 -Summary: A Firewire Interface -Group: System/Kernel +Summary: A Firewire Interface library +Group: System/Libraries %description 11 -A library for the Linux IEEE-1394 subsystem, which provides direct -access to the connected 1394 (Firewire) bus. +libraw1394 provides direct access to the connected 1394 buses to +userspace. Through this library, applications can directly send to +and receive from other nodes without requiring a kernel driver for +the protocol in question. + +libraw1394 abstracts the interface that is used to communicate with +the kernel. It works with both the Juju stack (firewire-core.ko; +/dev/fw*; present since Linux kernel 2.6.22) and the old Linux1394 +(raw1394.ko; /dev/raw1394; present until 2.6.36). %package devel -Summary: Development and Include Files for libraw1394 +Summary: Development files for libraw1394 Group: Development/Libraries/C and C++ Summary(pt_BR): Arquivos de desenvolvimento e cabeçalhos para o libraw1394 -Requires: %{name}-11 == %{version} +Requires: %{name}-11 = %{version} Requires: glibc-devel %description devel -Libraw1394 is the only supported interface to the kernel side raw1394 -of the Linux IEEE-1394 subsystem, which provides the user space direct -access to the connected 1394 buses. Through libraw1394/raw1394, -applications can directly send to and receive from other nodes without -requiring a kernel driver for the protocol in question. +libraw1394 provides direct access to the connected 1394 buses to +userspace. Through this library, applications can directly send to +and receive from other nodes without requiring a kernel driver for +the protocol in question. -This archive contains the header files for libraw1394 development. +This subpackage contains the library links and headers for +libraw1394. + +%package tools +Summary: Command-line utilties to manipulate IEEE1394 devices +Group: Hardware/Other +# added on 2015-11-14 +Obsoletes: %name < %version-%release +Provides: %name = %version-%release + +%description tools +Command-line utilities to inspect and send IEEE 1394 isochronous +packets, and to test the basic functionality of raw1394. %prep %setup -q @@ -93,9 +93,7 @@ This archive contains the header files for libraw1394 development. %build autoreconf --force --install -%configure \ - --disable-static \ - --with-pic +%configure --disable-static make %{?_smp_mflags} all %install @@ -107,13 +105,13 @@ rm -f %{buildroot}%{_libdir}/libraw1394.la %postun 11 -p /sbin/ldconfig -%files +%files tools %defattr(-,root,root) %doc AUTHORS COPYING* NEWS README %{_bindir}/testlibraw %{_bindir}/dumpiso %{_bindir}/sendiso -%{_mandir}/man*/* +%{_mandir}/man1/* %files 11 %defattr(-,root,root)