rpms/libdvdread/F-10 libdvdread-endian.patch, NONE, 1.1 libdvdread-multilib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libdvdread.spec, 1.8, 1.9 sources, 1.6, 1.7
Dominik Mierzejewski
rathann at fedoraproject.org
Sat Nov 14 20:39:54 UTC 2009
- Previous message: rpms/kdebase-workspace/F-10 kubuntu_101_brightness_fn_keys_and_osd.diff, NONE, 1.1 kdebase-workspace.spec, 1.197, 1.198
- Next message: rpms/bouml/devel .cvsignore, 1.21, 1.22 bouml.spec, 1.30, 1.31 sources, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rathann
Update of /cvs/pkgs/rpms/libdvdread/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7838
Modified Files:
.cvsignore libdvdread.spec sources
Added Files:
libdvdread-endian.patch libdvdread-multilib.patch
Log Message:
* Sat Nov 14 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.1.svn1183
- updated to SVN r1183
- simplified multilib patch
- fixed endianness issues (rhbz#442508)
- added some docs
- fix multilib conflict (#477687) (patch by Rex Dieter)
libdvdread-endian.patch:
configure2 | 14 ++++++++++++++
1 file changed, 14 insertions(+)
--- NEW FILE libdvdread-endian.patch ---
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" >> config.h || 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
libdvdread-multilib.patch:
Makefile | 3 ---
misc/dvdread-config.sh | 9 ++++-----
2 files changed, 4 insertions(+), 8 deletions(-)
--- NEW FILE libdvdread-multilib.patch ---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 9 Sep 2008 17:47:34 -0000 1.5
+++ .cvsignore 14 Nov 2009 20:39:53 -0000 1.6
@@ -1 +1 @@
-libdvdread-4.1.3.tar.bz2
+libdvdread-svn1183.tar.bz2
Index: libdvdread.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-10/libdvdread.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libdvdread.spec 9 Sep 2008 17:47:34 -0000 1.8
+++ libdvdread.spec 14 Nov 2009 20:39:53 -0000 1.9
@@ -1,14 +1,19 @@
Name: libdvdread
-Version: 4.1.3
-Release: 1%{?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: %{name}-multilib.patch
%description
libdvdread provides a simple foundation for reading DVD video disks.
@@ -28,6 +33,8 @@ This package contains development files
%prep
%setup -q
+%patch0 -p1 -b .endian
+%patch1 -p1 -b .multilib
%build
./configure2 \
@@ -54,16 +61,25 @@ 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
+* Sat Nov 14 2009 Dominik Mierzejewski <rpm at greysector.net> 4.1.4-0.1.svn1183
+- updated to SVN r1183
+- simplified multilib patch
+- fixed endianness issues (rhbz#442508)
+- added some docs
+- fix multilib conflict (#477687) (patch by Rex Dieter)
+
* Tue Sep 09 2008 Dominik Mierzejewski <rpm at greysector.net> 4.1.3-1
- update to 4.1.3 final
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdvdread/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 9 Sep 2008 17:47:34 -0000 1.6
+++ sources 14 Nov 2009 20:39:53 -0000 1.7
@@ -1 +1 @@
-6dc068d442c85a3cdd5ad3da75f6c6e8 libdvdread-4.1.3.tar.bz2
+0fdb0cfb8655abecfb1498a4ea73ef71 libdvdread-svn1183.tar.bz2
- Previous message: rpms/kdebase-workspace/F-10 kubuntu_101_brightness_fn_keys_and_osd.diff, NONE, 1.1 kdebase-workspace.spec, 1.197, 1.198
- Next message: rpms/bouml/devel .cvsignore, 1.21, 1.22 bouml.spec, 1.30, 1.31 sources, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list