From 83ddb6e68d238da34bdd7f6cfd18b986e21afb7a Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sat, 26 Sep 2009 23:40:36 +0000 Subject: [PATCH] - updated to SVN r1183 - simplified multilib patch - fixed endianness issues (rhbz#442508) - added some docs --- .cvsignore | 2 +- libdvdread-4.1.3-multilib.patch | 54 --------------------------------- libdvdread-endian.patch | 31 +++++++++++++++++++ libdvdread-multilib.patch | 47 ++++++++++++++++++++++++++++ libdvdread.spec | 23 +++++++++----- sources | 2 +- 6 files changed, 96 insertions(+), 63 deletions(-) delete mode 100644 libdvdread-4.1.3-multilib.patch create mode 100644 libdvdread-endian.patch create mode 100644 libdvdread-multilib.patch diff --git a/.cvsignore b/.cvsignore index a19898f..36a5241 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libdvdread-4.1.3.tar.bz2 +libdvdread-svn1183.tar.bz2 diff --git a/libdvdread-4.1.3-multilib.patch b/libdvdread-4.1.3-multilib.patch deleted file mode 100644 index 099f38d..0000000 --- a/libdvdread-4.1.3-multilib.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up libdvdread-4.1.3/Makefile.multilib libdvdread-4.1.3/Makefile ---- libdvdread-4.1.3/Makefile.multilib 2008-08-31 04:27:37.000000000 -0500 -+++ libdvdread-4.1.3/Makefile 2009-06-27 20:50:40.149705039 -0500 -@@ -130,11 +130,11 @@ distclean: clean - - dvdread-config: $(.OBJDIR)/dvdread-config - $(.OBJDIR)/dvdread-config: $(BUILDDEPS) -- @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config -- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config -- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config -- @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config -- @echo >> $(.OBJDIR)/dvdread-config -+ echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config -+ #echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config -+ #echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config -+ #echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config -+ echo >> $(.OBJDIR)/dvdread-config - cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config - chmod 0755 $(.OBJDIR)/dvdread-config - -diff -up libdvdread-4.1.3/misc/dvdread-config.sh.multilib libdvdread-4.1.3/misc/dvdread-config.sh ---- libdvdread-4.1.3/misc/dvdread-config.sh.multilib 2008-04-19 15:18:35.000000000 -0500 -+++ libdvdread-4.1.3/misc/dvdread-config.sh 2009-06-27 20:49:36.676703194 -0500 -@@ -1,4 +1,3 @@ --dvdreadlib="-ldvdread" - - usage() - { -@@ -28,7 +27,7 @@ while test $# -gt 0; do - echo_prefix=yes - ;; - --version) -- echo $version -+ echo `pkg-config --modversion dvdread` - ;; - --cflags) - echo_cflags=yes -@@ -44,13 +43,13 @@ while test $# -gt 0; do - done - - if test "$echo_prefix" = "yes"; then -- echo $prefix -+ echo `pkg-config --variable=prefix dvdread` - fi - - if test "$echo_cflags" = "yes"; then -- echo -I$prefix/include $extracflags -+ echo `pkg-config --cflags dvdread` - fi - - if test "$echo_libs" = "yes"; then -- echo -L$libdir $dvdreadlib -+ echo `pkg-config --libs dvdread` - fi diff --git a/libdvdread-endian.patch b/libdvdread-endian.patch new file mode 100644 index 0000000..4725824 --- /dev/null +++ b/libdvdread-endian.patch @@ -0,0 +1,31 @@ +diff -up libdvdread-4.1.4/configure2.endian libdvdread-4.1.4/configure2 +--- libdvdread-4.1.4/configure2.endian 2009-09-27 00:23:58.000000000 +0200 ++++ libdvdread-4.1.4/configure2 2009-09-27 01:26:56.000000000 +0200 +@@ -108,6 +108,19 @@ + ;; + esac + ++echo -n "Checking if we're big-endian... " ++bigendian=no ++TMPD=`mktemp -d` ++TMPC=$TMPD/endian.c ++TMPO=$TMPD/endian.o ++cat > $TMPC < config.mak << EOF + # Automatically generated by configure, do not edit + PREFIX=$PREFIX +@@ -136,6 +149,7 @@ + /* Automatically generated by configure, do not edit */ + #include "version.h" + EOF ++test "$bigendian" == "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h + + # build tree in object directory if source path is different from current one + if test "$source_path_used" != "no"; then diff --git a/libdvdread-multilib.patch b/libdvdread-multilib.patch new file mode 100644 index 0000000..b5bef38 --- /dev/null +++ b/libdvdread-multilib.patch @@ -0,0 +1,47 @@ +diff -up libdvdread-4.1.4/Makefile.multilib libdvdread-4.1.4/Makefile +--- libdvdread-4.1.4/Makefile.multilib 2008-12-31 09:43:03.000000000 +0100 ++++ libdvdread-4.1.4/Makefile 2009-09-27 00:41:34.000000000 +0200 +@@ -131,9 +131,6 @@ distclean: clean + dvdread-config: $(.OBJDIR)/dvdread-config + $(.OBJDIR)/dvdread-config: $(BUILDDEPS) + @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config +- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config +- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config +- @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config + @echo >> $(.OBJDIR)/dvdread-config + cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config + chmod 0755 $(.OBJDIR)/dvdread-config +diff -up libdvdread-4.1.4/misc/dvdread-config.sh.multilib libdvdread-4.1.4/misc/dvdread-config.sh +--- libdvdread-4.1.4/misc/dvdread-config.sh.multilib 2008-09-23 11:14:45.000000000 +0200 ++++ libdvdread-4.1.4/misc/dvdread-config.sh 2009-09-27 00:39:39.000000000 +0200 +@@ -1,4 +1,3 @@ +-dvdreadlib="-ldvdread" + + usage() + { +@@ -28,7 +27,7 @@ while test $# -gt 0; do + echo_prefix=yes + ;; + --version) +- echo $version ++ echo `pkg-config --modversion dvdread` + ;; + --cflags) + echo_cflags=yes +@@ -44,13 +43,13 @@ while test $# -gt 0; do + done + + if test "$echo_prefix" = "yes"; then +- echo $prefix ++ echo `pkg-config --variable=prefix dvdread` + fi + + if test "$echo_cflags" = "yes"; then +- echo -I$prefix/include $extracflags ++ echo `pkg-config --cflags dvdread` + fi + + if test "$echo_libs" = "yes"; then +- echo -L$libdir $dvdreadlib ++ echo `pkg-config --libs dvdread` + fi diff --git a/libdvdread.spec b/libdvdread.spec index 14d8054..7099f1f 100644 --- a/libdvdread.spec +++ b/libdvdread.spec @@ -1,18 +1,19 @@ Name: libdvdread -Version: 4.1.3 -Release: 4%{?dist} +Version: 4.1.4 +Release: 0.1.svn1183%{?dist} Summary: A library for reading DVD video discs based on Ogle code Group: System Environment/Libraries License: GPLv2+ -Source: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2 +#Source: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-%{version}.tar.bz2 # svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread -#Source: %{name}-4.1.3rc1.tar.bz2 +Source: %{name}-svn1183.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - +# fix endianness issues on bigendian platforms +Patch0: %{name}-endian.patch # dvdread-config: use pkg-config instead of hard-coded # multilib-conflicting values -Patch1: libdvdread-4.1.3-multilib.patch +Patch1: %{name}-multilib.patch %description libdvdread provides a simple foundation for reading DVD video disks. @@ -32,7 +33,7 @@ This package contains development files for libdvdread. %prep %setup -q - +%patch0 -p1 -b .endian %patch1 -p1 -b .multilib %build @@ -60,16 +61,24 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog README %{_libdir}/libdvdread.so.* %files devel %defattr(-,root,root,-) +%doc DEVELOPMENT-POLICY.txt TODO %{_bindir}/dvdread-config %{_includedir}/dvdread %{_libdir}/libdvdread.so %{_libdir}/pkgconfig/dvdread.pc %changelog +* Sun Sep 27 2009 Dominik Mierzejewski 4.1.4-0.1.svn1183 +- updated to SVN r1183 +- simplified multilib patch +- fixed endianness issues (rhbz#442508) +- added some docs + * Fri Jul 24 2009 Fedora Release Engineering - 4.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 2435ea0..fe0e5a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6dc068d442c85a3cdd5ad3da75f6c6e8 libdvdread-4.1.3.tar.bz2 +0fdb0cfb8655abecfb1498a4ea73ef71 libdvdread-svn1183.tar.bz2