- updated to SVN r1226

- dropped obsolete endianness check patch
This commit is contained in:
Dominik Mierzejewski 2011-04-11 03:43:02 +02:00
parent 9a48695b85
commit a5eb3c1793
4 changed files with 10 additions and 37 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
libdvdread-svn1188.tar.bz2
/libdvdread-svn1226.tar.bz2

View File

@ -1,31 +0,0 @@
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

View File

@ -1,16 +1,16 @@
%global svn 1226
Name: libdvdread
Version: 4.1.4
Release: 0.3.svn1188%{?dist}
Release: 0.4.svn%{svn}%{?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
# svn export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
Source: %{name}-svn1188.tar.bz2
Source: %{name}-svn%{svn}.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
@ -33,7 +33,6 @@ This package contains development files for libdvdread.
%prep
%setup -q
%patch0 -p1 -b .endian
%patch1 -p1 -b .multilib
%build
@ -73,6 +72,10 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/dvdread.pc
%changelog
* Mon Apr 11 2011 Dominik Mierzejewski <rpm@greysector.net> 4.1.4-0.4.svn1226
- updated to SVN r1226
- dropped obsolete endianness check patch
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.4-0.3.svn1188
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

View File

@ -1 +1 @@
ee7cb8f99371fa332feea2f420694b6b libdvdread-svn1188.tar.bz2
f92f81bc1936755f45f088b144dd4d4d libdvdread-svn1226.tar.bz2