[packages/libodraw] - new - patched for bison 3.x and some issues with libhmac and libcsystem usage
qboosh
qboosh at pld-linux.org
Fri Jan 23 23:08:04 CET 2015
commit 449af785af3210fdd5756f96760cf51540ffa73f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jan 23 23:09:48 2015 +0100
- new
- patched for bison 3.x and some issues with libhmac and libcsystem usage
libodraw-bison.patch | 54 +++++++++++++++++
libodraw-libcsystem.patch | 12 ++++
libodraw-libhmac.patch | 11 ++++
libodraw-system-libs.patch | 85 ++++++++++++++++++++++++++
libodraw.spec | 147 +++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 309 insertions(+)
---
diff --git a/libodraw.spec b/libodraw.spec
new file mode 100644
index 0000000..1648c29
--- /dev/null
+++ b/libodraw.spec
@@ -0,0 +1,147 @@
+Summary: Library to access optical disc (split) RAW formats
+Summary(pl.UTF-8): Biblioteka służąca do dostępu do surowych (podzielonych) formatów dysków optycznych
+Name: libodraw
+Version: 20150105
+Release: 1
+License: LGPL v3+
+Group: Libraries
+Source0: https://github.com/libyal/libodraw/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 193b53914a854694c67972df61ba4a55
+Patch0: %{name}-system-libs.patch
+Patch1: %{name}-bison.patch
+Patch2: %{name}-libhmac.patch
+Patch3: %{name}-libcsystem.patch
+URL: https://github.com/libyal/libodraw/
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake >= 1.6
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: libbfio-devel >= 20120426
+BuildRequires: libcdata-devel >= 20150102
+BuildRequires: libcerror-devel >= 20120425
+BuildRequires: libcfile-devel >= 20140503
+BuildRequires: libclocale-devel >= 20130406
+BuildRequires: libcnotify-devel >= 20120425
+BuildRequires: libcpath-devel >= 20120701
+BuildRequires: libcsplit-devel >= 20120701
+BuildRequires: libcstring-devel >= 20120425
+BuildRequires: libcsystem-devel >= 20141018
+BuildRequires: libcthreads-devel >= 20130509
+BuildRequires: libhmac-devel >= 20130714
+BuildRequires: libuna-devel >= 20120425
+BuildRequires: libtool
+BuildRequires: openssl-devel >= 1.0
+BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
+Requires: libbfio >= 20120426
+Requires: libcdata >= 20150102
+Requires: libcerror >= 20120425
+Requires: libcfile >= 20140503
+Requires: libclocale >= 20130406
+Requires: libcnotify >= 20120425
+Requires: libcpath >= 20120701
+Requires: libcsplit >= 20120701
+Requires: libcstring >= 20120425
+Requires: libcsystem >= 20141018
+Requires: libcthreads >= 20130509
+Requires: libhmac >= 20130714
+Requires: libuna >= 20120425
+Requires: openssl >= 1.0
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+libodraw is a library to access optical disc (split) RAW formats.
+
+%description -l pl.UTF-8
+libodraw to biblioteka służąca do dostępu do surowych (podzielonych)
+formatów dysków optycznych.
+
+%package devel
+Summary: Header files for libodraw library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libodraw
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libbfio-devel >= 20120426
+Requires: libcdata-devel >= 20150102
+Requires: libcerror-devel >= 20120425
+Requires: libcfile-devel >= 20140503
+Requires: libclocale-devel >= 20130406
+Requires: libcnotify-devel >= 20120425
+Requires: libcpath-devel >= 20120701
+Requires: libcsplit-devel >= 20120701
+Requires: libcstring-devel >= 20120425
+Requires: libcthreads-devel >= 20130509
+Requires: libuna-devel >= 20120425
+
+%description devel
+Header files for libodraw library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libodraw.
+
+%package static
+Summary: Static libodraw library
+Summary(pl.UTF-8): Statyczna biblioteka libodraw
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static libodraw library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libodraw.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
+%{__gettextize}
+%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libodraw.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog README
+%attr(755,root,root) %{_bindir}/odrawinfo
+%attr(755,root,root) %{_bindir}/odrawverify
+%attr(755,root,root) %{_libdir}/libodraw.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libodraw.so.1
+%{_mandir}/man1/odrawinfo.1*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libodraw.so
+%{_includedir}/libodraw
+%{_includedir}/libodraw.h
+%{_pkgconfigdir}/libodraw.pc
+%{_mandir}/man3/libodraw.3*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libodraw.a
diff --git a/libodraw-bison.patch b/libodraw-bison.patch
new file mode 100644
index 0000000..d2ed3b9
--- /dev/null
+++ b/libodraw-bison.patch
@@ -0,0 +1,54 @@
+--- libodraw-20150105/libodraw/libodraw_cue_parser.y.orig 2015-01-05 19:01:57.000000000 +0100
++++ libodraw-20150105/libodraw/libodraw_cue_parser.y 2015-01-23 22:14:43.088287239 +0100
+@@ -22,6 +22,7 @@
+
+ #include <common.h>
+ #include <types.h>
++#include <string.h>
+
+ #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
+ #include <stdlib.h>
+@@ -67,8 +68,16 @@
+ lba += ( ( msf_string[ 3 ] - '0' ) * 10 ) + ( msf_string[ 4 ] - '0' ); \
+ lba *= CD_FRAMES; \
+ lba += ( ( msf_string[ 6 ] - '0' ) * 10 ) + ( msf_string[ 7 ] - '0' );
++
+ %}
+
++%code requires {
++typedef struct cue_parser_state cue_parser_state_t;
++}
++
++%lex-param { void * NULL }
++%parse-param { cue_parser_state_t *parser_state }
++
+ /* %name-prefix="cue_scanner_" replaced by -p cue_scanner_ */
+ /* %no-lines replaced by -l */
+
+@@ -97,8 +106,6 @@
+
+ %{
+
+-typedef struct cue_parser_state cue_parser_state_t;
+-
+ struct cue_parser_state
+ {
+ /* The file
+@@ -224,6 +231,7 @@ extern int cue_scanner_lex(
+ void *user_data );
+
+ extern void cue_scanner_error(
++ cue_parser_state_t *parser_state,
+ const char *error_string );
+
+ extern YY_BUFFER_STATE cue_scanner__scan_buffer(
+--- libodraw-20150105/libodraw/libodraw_cue_scanner.l.orig 2015-01-05 19:01:57.000000000 +0100
++++ libodraw-20150105/libodraw/libodraw_cue_scanner.l 2015-01-23 21:06:12.108459763 +0100
+@@ -374,6 +374,7 @@ int cue_scanner_wrap(
+ }
+
+ void cue_scanner_error(
++ cue_parser_state_t *parser_state,
+ const char *error_string )
+ {
+ if( cue_scanner_suppress_error == 0 )
diff --git a/libodraw-libcsystem.patch b/libodraw-libcsystem.patch
new file mode 100644
index 0000000..720b7a6
--- /dev/null
+++ b/libodraw-libcsystem.patch
@@ -0,0 +1,12 @@
+--- libodraw-20150105/odrawtools/odrawverify.c.orig 2015-01-05 19:01:57.000000000 +0100
++++ libodraw-20150105/odrawtools/odrawverify.c 2015-01-23 22:39:17.438225367 +0100
+@@ -26,6 +26,9 @@
+ #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
+ #include <stdlib.h>
+ #endif
++#if defined( HAVE_UNISTD_H )
++#include <unistd.h>
++#endif
+
+ #include "byte_size_string.h"
+ #include "digest_hash.h"
diff --git a/libodraw-libhmac.patch b/libodraw-libhmac.patch
new file mode 100644
index 0000000..278471d
--- /dev/null
+++ b/libodraw-libhmac.patch
@@ -0,0 +1,11 @@
+--- libodraw-20150105/odrawtools/odrawtools_libhmac.h.orig 2015-01-05 19:01:57.000000000 +0100
++++ libodraw-20150105/odrawtools/odrawtools_libhmac.h 2015-01-23 22:35:15.718235511 +0100
+@@ -33,7 +33,7 @@
+ #include <libhmac_support.h>
+ #include <libhmac_types.h>
+
+-#elif defined( HAVE_LIBHMAC_H )
++#else
+ #include <libhmac.h>
+
+ #endif
diff --git a/libodraw-system-libs.patch b/libodraw-system-libs.patch
new file mode 100644
index 0000000..0bb6006
--- /dev/null
+++ b/libodraw-system-libs.patch
@@ -0,0 +1,85 @@
+--- libodraw-20150105/configure.ac.orig 2015-01-23 18:09:56.162236924 +0100
++++ libodraw-20150105/configure.ac 2015-01-23 18:11:42.702232453 +0100
+@@ -306,20 +306,7 @@ dnl Have configure make the Makefiles
+ AC_CONFIG_FILES([Makefile])
+ AC_CONFIG_FILES([include/Makefile])
+ AC_CONFIG_FILES([common/Makefile])
+-AC_CONFIG_FILES([libcstring/Makefile])
+-AC_CONFIG_FILES([libcerror/Makefile])
+-AC_CONFIG_FILES([libcthreads/Makefile])
+-AC_CONFIG_FILES([libcdata/Makefile])
+-AC_CONFIG_FILES([libclocale/Makefile])
+-AC_CONFIG_FILES([libcnotify/Makefile])
+-AC_CONFIG_FILES([libcsplit/Makefile])
+-AC_CONFIG_FILES([libuna/Makefile])
+-AC_CONFIG_FILES([libcfile/Makefile])
+-AC_CONFIG_FILES([libcpath/Makefile])
+-AC_CONFIG_FILES([libbfio/Makefile])
+ AC_CONFIG_FILES([libodraw/Makefile])
+-AC_CONFIG_FILES([libcsystem/Makefile])
+-AC_CONFIG_FILES([libhmac/Makefile])
+ AC_CONFIG_FILES([odrawtools/Makefile])
+ AC_CONFIG_FILES([po/Makefile.in])
+ AC_CONFIG_FILES([po/Makevars])
+--- libodraw-20150105/Makefile.am.orig 2015-01-23 18:09:55.852236937 +0100
++++ libodraw-20150105/Makefile.am 2015-01-23 18:12:07.965564727 +0100
+@@ -3,20 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ include \
+ common \
+- libcstring \
+- libcerror \
+- libcthreads \
+- libcdata \
+- libclocale \
+- libcnotify \
+- libcsplit \
+- libuna \
+- libcfile \
+- libcpath \
+- libbfio \
+ libodraw \
+- libcsystem \
+- libhmac \
+ odrawtools \
+ po \
+ manuals \
+@@ -68,17 +55,6 @@ lib: library
+
+ library:
+ (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS))
+ (cd $(srcdir)/libodraw && $(MAKE) $(AM_MAKEFLAGS))
+ (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
+
+@@ -95,20 +71,7 @@ distclean: clean
+ done && test -z "$$fail"
+
+ splint:
+- (cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcsplit && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcpath && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libbfio && $(MAKE) splint $(AM_MAKEFLAGS))
+ (cd $(srcdir)/libodraw && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcsystem && $(MAKE) splint $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libhmac && $(MAKE) splint $(AM_MAKEFLAGS))
+ (cd $(srcdir)/odrawtools && $(MAKE) splint $(AM_MAKEFLAGS))
+ (cd $(srcdir)/po && $(MAKE) splint $(AM_MAKEFLAGS))
+ (cd $(srcdir)/tests && $(MAKE) splint $(AM_MAKEFLAGS))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libodraw.git/commitdiff/449af785af3210fdd5756f96760cf51540ffa73f
More information about the pld-cvs-commit
mailing list