- updated to SVN r1183
- simplified multilib patch - fixed endianness issues (rhbz#442508) - added some docs
This commit is contained in:
Dominik Mierzejewski
parent
f07f580bad
commit
83ddb6e68d
@ -1 +1 @@
|
||||
libdvdread-4.1.3.tar.bz2
|
||||
libdvdread-svn1183.tar.bz2
|
||||
|
||||
@ -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
|
||||
31
libdvdread-endian.patch
Normal file
31
libdvdread-endian.patch
Normal file
@ -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 <<EOF
|
||||
+unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
|
||||
+EOF
|
||||
+$cc $optimizations $cflags -c -o $TMPO $TMPC
|
||||
+od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && bigendian=yes
|
||||
+rm -rf $TMPD
|
||||
+echo "$bigendian"
|
||||
+
|
||||
cat > 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
|
||||
47
libdvdread-multilib.patch
Normal file
47
libdvdread-multilib.patch
Normal file
@ -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
|
||||
@ -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 <rpm@greysector.net> 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 <rel-eng@lists.fedoraproject.org> - 4.1.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user