From ff3c421f8dbdb581448b63316009668d1bc277f5 Mon Sep 17 00:00:00 2001 From: ddennedy Date: Sat, 30 Oct 2004 22:49:27 +0000 Subject: [PATCH] bump versions, build fixes, and doc updates git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@140 53a565d1-3bb7-0310-b661-cf11e63c67ab --- ChangeLog | 14 ++++++++ Makefile.am | 11 +++--- NEWS | 15 +++++++++ README | 32 ++++++++---------- configure.ac | 14 +++++--- doc/Makefile.am | 2 +- doc/libraw1394.sgml | 11 ++++-- libraw1394.spec.in | 79 ++++++++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 4 ++- src/kernel-raw1394.h | 2 +- src/version.c | 5 --- tools/Makefile.am | 1 + 12 files changed, 152 insertions(+), 38 deletions(-) create mode 100644 ChangeLog create mode 100644 libraw1394.spec.in diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..67bfa70 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,14 @@ +This project does not use a ChangeLog file. + +The source code of this project is managed by the Subversion revision +control system (http://subversion.tigris.org), a very nice replacement +for the venerable CVS. One of the many nice features of Subversion is +the 'log' command, which will give you the equivalent of a GNU style +ChangeLog file. + +To view the Subversion log for this project you must have a Subversion +client installed. Type on the command line + + $ svn://svn.linux1394.org/libraw1394/trunk + +to view the log. diff --git a/Makefile.am b/Makefile.am index edef492..04ed38a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,13 +2,13 @@ SUBDIRS = src tools doc debian -aclocaldir = @datadir@/aclocal -aclocal_DATA = libraw1394.m4 - pkgconfigdir = @libdir@/pkgconfig pkgconfig_DATA = libraw1394.pc -EXTRA_DIST = libraw1394.m4 libraw1394.pc +EXTRA_DIST = libraw1394.pc libraw1394.spec + +MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in stamp-h.in \ + depcomp install-sh missing mkinstalldirs config.guess ltmain.sh doc: psdoc pdfdoc htmldoc @@ -45,3 +45,6 @@ install-exec-hook: echo "********************************************"; \ echo; \ fi + +dist-hook: + svn log >$(distdir)/ChangeLog diff --git a/NEWS b/NEWS index ddf3587..6cdc432 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +Version 1.1.0: +- added ability to specify the isochronous receive mode in the new + rawiso (raw1394_iso_*) API. Therefore, the signature of + raw1394_iso_recv_init() changed, and likewise, the libtool/.so version + numbers changed to reflect a new interface that is not backwards compatible! +- added raw1394_arm_set_buf() and raw1394_arm_get_buf() functions. +- new, consistent versioning scheme. 1.0.0 was reported by pkg-config in 0.10 + series; hence, 1.1.0 in this release. +- removed outdated, bogus "linking required only" version symbols in + version.c - use pkg-config now. +- dropped libraw1394.m4 - use pkg-config now. +- incremented the raw1394 kernel API protocol version to 5 due to features + introduced in v0.10. +- added RPM spec file. + Version 0.10: - merged in the rawiso branch diff --git a/README b/README index abaf692..eb0d756 100644 --- a/README +++ b/README @@ -30,8 +30,7 @@ files. Finally there is something, in the doc subdirectory. The file is libraw1394.sgml (it's Docbook format), and there are preformatted PostScript and -HTML available. This documentation is not complete yet! I hopefully will have -a libraw1394 0.9.1 out soon with finished documentation. +HTML available. This documentation is not complete yet. 4. Multithreading @@ -42,28 +41,23 @@ operating on the same handle would royally mess up the kernel-user protocol. Simply use separate handles for each thread in which you need to use libraw1394. -5. Autoconf macro +5. Pkg-config - Along with the library an autoconf macro gets installed (in -$prefix/share/aclocal). It is called the following way: + The library comes with a pkg-config .pc file, so you can check for +libraw1394 and its version in your configure script. For example, here is how +to use the autoconf macro: -AC_LIB_RAW1394(MINIMUMVERSION[,ACTION_IF_FOUND[,ACTION_IF_NOT_FOUND]]) +PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.1.0) - Versions prior to 0.9 can not be checked and appear as "not found". -This macro sets the variables LIBRAW1394_CPPFLAGS, LIBRAW1394_CFLAGS and -LIBRAW1394_LIBS. You have to include those into your build variables so that -the build process correctly links with libraw1394. + This macro sets the variables LIBRAW1394_CFLAGS and LIBRAW1394_LIBS. You +have to include those into your build variables so that the build process +correctly links with libraw1394. 6. Maintainer - Maintainer of libraw1394 is currently Andreas Bombe. Send suggestions, -bug reports and fixes to andreas.bombe@munich.netsurf.de. See the file AUTHORS -for a complete list of contributors to libraw1394. + Maintainers of libraw1394 are currently Ben Collins and Dan Dennedy. Send +suggestions, bug reports and fixes to linux1394-devel@lists.sourceforge.net. +See the file AUTHORS for a complete list of contributors to libraw1394. - You can get updates through this project's homepage on SourceForge, see -http://sourceforge.net/project/?group_id=2514 for more information. You can -also submit bugs through this page. - - -2001-05-14 Andreas Bombe +Visit http://www.linux1394.org/ for more information or to see what is new. diff --git a/configure.ac b/configure.ac index acbea25..755c48c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,14 @@ # process this file with autoconf to get a configure script -AC_INIT(Makefile.am) -AM_INIT_AUTOMAKE(libraw1394, 1.0.0) +AC_INIT(libraw1394, 1.1.0) +AC_CONFIG_SRCDIR(src/raw1394.h) AM_CONFIG_HEADER(config.h) +dnl Checking if the NEWS file has been updated to reflect the current version. +AM_INIT_AUTOMAKE(check-news) + AC_PROG_CC -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL AC_PROG_INSTALL AC_CHECK_SIZEOF(void *, 8) @@ -13,9 +16,9 @@ AC_C_CONST AC_C_BIGENDIAN # set the libtool so version numbers -lt_major=7 +lt_major=8 lt_revision=0 -lt_age=2 +lt_age=0 AC_SUBST(lt_major) AC_SUBST(lt_revision) @@ -26,6 +29,7 @@ CFLAGS=${CFLAGS:-"-Wall -O2"} AC_OUTPUT([ Makefile libraw1394.pc +libraw1394.spec src/Makefile tools/Makefile doc/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 68a5d48..7f1d80c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -9,7 +9,7 @@ man_MANS = testlibraw.1 sendiso.1 dumpiso.1 isodump.5 CLEANFILES = libraw1394.aux libraw1394.dvi libraw1394.log libraw1394.out \ libraw1394.tex libraw1394.pdf -MAINTAINERCLEANFILES = libraw1394.ps +MAINTAINERCLEANFILES = Makefile.in libraw1394.ps maintainer-clean-local: rm -rf libraw1394 diff --git a/doc/libraw1394.sgml b/doc/libraw1394.sgml index 62ae8a0..9073690 100644 --- a/doc/libraw1394.sgml +++ b/doc/libraw1394.sgml @@ -4,7 +4,7 @@ libraw1394 - version 0.9 + version 1.0.0 2001 @@ -319,6 +319,7 @@ be different nodes, so automatic behaviour would be very undesirable in these cases. + @@ -694,7 +695,8 @@ speed is the isochronous speed at which you wish to operate. Possible values are - RAW1394_ISO_SPEED_100 through + RAW1394_ISO_SPEED_100, + RAW1394_ISO_SPEED_200, and RAW1394_ISO_SPEED_400. @@ -705,6 +707,11 @@ irq_interval packets). Pass -1 to receive a default value that should be suitable for most applications. + + + mode for raw1394_iso_recv_init() + sets whether to use packet-per-buffer or buffer-fill receive mode. + If raw1394_iso_xmit/recv_init() retuns diff --git a/libraw1394.spec.in b/libraw1394.spec.in new file mode 100644 index 0000000..a10ee7c --- /dev/null +++ b/libraw1394.spec.in @@ -0,0 +1,79 @@ +%define prefix /usr + +Name: @PACKAGE@ +Version: @VERSION@ +Release: 1 +Copyright: LGPL +Group: Libraries +Source: http://linux1394.org/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz +URL: http://linux1394.org +BuildRoot: /var/tmp/@PACKAGE@-@VERSION@-root +Summary: Streaming library for IEEE1394 +BuildRequires: openjade + +%changelog + +%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. + +%package devel +Summary: Development libs for libraw1394 +Group: Development/Libraries +Requires: %{name} = %{version} + + +%description devel +Development libraries needed to build applications against libraw1394 + +%changelog + +%prep +%setup + +%build +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} +make + +%install +rm -rf $RPM_BUILD_ROOT + +make prefix=$RPM_BUILD_ROOT%{prefix} install + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) + +%doc AUTHORS COPYING.LIB NEWS README +%{prefix}/lib/libraw1394.so.* + +%files devel +%defattr(-, root, root) + +%{prefix}/bin/* +%{prefix}/lib/*.so +%{prefix}/lib/*a +%{prefix}/include/* +%{prefix}/man/* +%{prefix}/lib/pkgconfig/libraw1394.pc diff --git a/src/Makefile.am b/src/Makefile.am index a5184a5..16b6add 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in # the libraw1394 itself @@ -15,7 +16,8 @@ libraw1394_la_SOURCES = \ arm.c \ version.c \ kernel-raw1394.h \ - raw1394_private.h + raw1394_private.h \ + ieee1394-ioctl.h # headers to be installed pkginclude_HEADERS = raw1394.h csr.h ieee1394.h diff --git a/src/kernel-raw1394.h b/src/kernel-raw1394.h index cd4fc47..6a3fa7c 100644 --- a/src/kernel-raw1394.h +++ b/src/kernel-raw1394.h @@ -3,7 +3,7 @@ /* header for the raw1394 API that is exported to user-space */ -#define RAW1394_KERNELAPI_VERSION 4 +#define RAW1394_KERNELAPI_VERSION 5 /* state: opened */ #define RAW1394_REQ_INITIALIZE 1 diff --git a/src/version.c b/src/version.c index 0ff0b60..2ca5b1e 100644 --- a/src/version.c +++ b/src/version.c @@ -10,11 +10,6 @@ #include -/* Variables to find version by linking (avoid need for test program) */ - -char __libraw1394_version_0_9; -char __libraw1394_version_0_9_0; - /* This function is to be used by the autoconf macro to find the lib version */ const char *raw1394_get_libversion() { diff --git a/tools/Makefile.am b/tools/Makefile.am index eaaa7ca..29b250e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,3 +1,4 @@ +MAINTAINERCLEANFILES = Makefile.in # testlibraw bin_PROGRAMS = testlibraw sendiso dumpiso