Packman Build Service PMBS

Changes of Revision 5

libdvdread.spec Changed

@@ -1,12 +1,4 @@
 %define _lto_cflags %{nil}
-# Packmangroup: Libraries
-# Packmanpackagename: libdvdread
-# Packman: Manfred Tremmel
-# Packmanpackagedesc: <p>libdvdread provides a simple foundation for reading DVD-Video images.</p>
-# Packmanpackagedesc_de: <p>Die libdvdread Bibliothek stellt einfache Basisfunktionen f&uuml;r den Zugriff auf Video-DVDs zuzugreifen.</p>
-# norootforbuild
-
-# definition von softwarename, version und release
 %define major     3
 %define libname   libdvdread
 
@@ -14,20 +6,16 @@
 Summary:        Library to access video DVDs
 Summary(de):    Bibliothek um auf Video-DVDs zuzugreifen
 License: GPL-2.0
-Group:          Productivity/Multimedia/Other
 URL:            http://www.dtek.chalmers.se/groups/dvd/index.shtml
 Version:        0.9.7
-Release:        7
+Release:        0
 
 Source0:        libdvdread-0.9.7.tar.bz2
 
 Patch0:         libdvdread-0.9.7-udffindfile.patch
-Patch1:         libdvdread_udf.patch
 Patch2:         libdvdread-strict-aliasing.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 Provides:       %{libname} = %{version}-%{release}
 Obsoletes:      %{libname} < %{version}-%{release}
-BuildRequires:  gcc
 
 %description
 libdvdread provides a simple foundation for reading DVD-Video images.
@@ -121,85 +109,28 @@
 
 
 %prep
-%setup -q -n %{libname}-%{version}
-%patch -P 0
-#%patch1 -p1
-%patch -P 2
+%autosetup -p1 -n %{libname}-%{version}
 
 %build
-mv configure configurex
-cat configurex | sed -e "s/linux-gnu\*)/linux\*)/g" > configure
-chmod 777 configure
+sed -i "s/linux-gnu\*)/linux\*)/g" configure
 %configure
-
-mv libtool libtoolx
-cat libtoolx | sed -e "s/\${SED}/sed/g" > libtool
-chmod 777 libtool
-%{__make} %{?jobs:-j%{jobs}}
+sed -i "s/\${SED}/sed/g" libtool
+%make_build
 
 %install
-%makeinstall
-
-%clean
- "%{buildroot}" != "/"  && %{__rm} -rf %{buildroot}
+%make_install
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
 %files -n %{name}
-%defattr(-, root, root)
-%doc AUTHORS COPYING NEWS README
+%license COPYING
 %{_libdir}/*.so.%{major}*
 
 %files -n %{name}-devel
-%defattr(-, root, root)
 %{_includedir}/dvdread
 %{_libdir}/*.so
 %{_libdir}/*.*a
 
 %changelog
-* Sun Sep 06 2009 Manfred.Tremmel <Manfred.Tremmel@iiv.de> - 0.9.7-5.pm.1
-- cleanups where rpmlint wasn't so happy
-* Mon Feb 18 2008 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- removed ifo patch, seems to make too much trouble...
-* Sat Feb 02 2008 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- changed the ifo patch from http://tobias.rautenkranz.ch/libdvdread_ifo.html
-  a little bit, overwrite ifo size only, when it's a invalid size
-* Wed Jan 23 2008 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- included ifo patch from http://tobias.rautenkranz.ch/libdvdread_ifo.html
-* Sat Oct 07 2006 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- Update to 0.9.7
-* Fri May 05 2006 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- Update to 0.9.6
-* Sun Jan 29 2006 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- another patch to solve segfaults with some programms like k9copy
-* Tue Jan 24 2006 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- added a patch to solve the undefined symbol: UDFFindFile problem
-  (hope so ;-) )
-* Mon Jan 23 2006 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- Update to 0.9.5
-* Sat Jun 25 2005 Manfred Tremmel <Manfred.Tremmel@iiv.de>
-- included a patch from SuSE 9.3
-* Wed Dec 01 2004 Manfred Tremmel <Manfred.Tremmel@iiv.de>
-- some cleanups
-* Sat Apr 12 2003 Manfred Tremmel <Manfred.Tremmel@iiv.de>
-- added packman build header
-* Sat Feb 22 2003 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- corrected provides entry
-* Fri Feb 14 2003 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- Update to 0.9.4
-* Tue Jan 21 2003 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- Provides libdvdread2 added
-* Tue Jan 21 2003 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- Some synchronisations with SuSE-spec-file
-* Fri Sep 27 2002 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- changes rpm-names to make it compatible with SuSE 8.1
-* Sat Jun 08 2002 Manfred.Tremmel <Manfred.Tremmel@iiv.de>
-- update to 0.9.3, split -develop package
-* Sat Dec 29 2001 Waldemar Brodkorb <waldemar@links2linux.de>
-- added small patch
-* Sat Dec 29 2001 Waldemar Brodkorb <waldemar@links2linux.de>
-- rebuild for libdvdcss 1.0.0
-* Sat Oct 27 2001 Waldemar Brodkorb <waldemar@links2linux.de>
-- first build & release

libdvdread-0.9.7-udffindfile.patch Changed

libdvdread-strict-aliasing.patch Changed

@@ -1,11 +1,48 @@
---- dvdread/nav_print.c
-+++ dvdread/nav_print.c
-@@ -72,7 +72,7 @@
+---
+ dvdread/md5.c       |    6 ------
+ dvdread/nav_print.c |    5 ++++-
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+
+--- a/dvdread/md5.c
++++ b/dvdread/md5.c
+@@ -27,14 +27,8 @@
+ 
+ #include <sys/types.h>
+ 
+-#if STDC_HEADERS || defined _LIBC
+ # include <stdlib.h>
+ # include <string.h>
+-#else
+-# ifndef HAVE_MEMCPY
+-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+-# endif
+-#endif
+ 
+ #include "md5.h"
+ //#include "unlocked-io.h"
+--- a/dvdread/nav_print.c
++++ b/dvdread/nav_print.c
+@@ -27,6 +27,7 @@
+ #include "config.h"
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #if defined(HAVE_INTTYPES_H)
+ #include <inttypes.h>
+@@ -67,12 +68,14 @@
+ 
+ 
+ static void navPrint_PCI_GI(pci_gi_t *pci_gi) {
++  unsigned int vobu_uop_ctl;
+   int i;
+ 
++  memcpy(&vobu_uop_ctl, &pci_gi->vobu_uop_ctl, sizeof(vobu_uop_ctl));
    printf("pci_gi:\n");
    printf("nv_pck_lbn    0x%08x\n", pci_gi->nv_pck_lbn);
    printf("vobu_cat      0x%04x\n", pci_gi->vobu_cat);
 -  printf("vobu_uop_ctl  0x%08x\n", *(uint32_t*)&pci_gi->vobu_uop_ctl);
-+  printf("vobu_uop_ctl  0x%08x\n", pci_gi->vobu_uop_ctl);
++  printf("vobu_uop_ctl  0x%08x\n", vobu_uop_ctl);
    printf("vobu_s_ptm    0x%08x\n", pci_gi->vobu_s_ptm);
    printf("vobu_e_ptm    0x%08x\n", pci_gi->vobu_e_ptm);
    printf("vobu_se_e_ptm 0x%08x\n", pci_gi->vobu_se_e_ptm);

libdvdread_udf.patch Deleted

@@ -1,117 +0,0 @@
-diff -ur libdvdread-0.9.7.orig/dvdread/dvd_input.c libdvdread-0.9.7/dvdread/dvd_input.c
---- libdvdread-0.9.7.orig/dvdread/dvd_input.c	2005-09-19 15:43:08.000000000 +0200
-+++ libdvdread-0.9.7/dvdread/dvd_input.c	2008-02-02 16:23:24.000000000 +0100
-@@ -376,6 +376,9 @@
-   }
- #endif /* HAVE_DVDCSS_DVDCSS_H */
- 
-+
-+	fprintf(stderr, "libdvdread patched to play DVDs with DVD-Movie-Protect\n");
-+
-   dvdcss_library_init = 1;
-   
-   if(dvdcss_library) {
-diff -ur libdvdread-0.9.7.orig/dvdread/dvd_udf.c libdvdread-0.9.7/dvdread/dvd_udf.c
---- libdvdread-0.9.7.orig/dvdread/dvd_udf.c	2005-09-19 15:43:08.000000000 +0200
-+++ libdvdread-0.9.7/dvdread/dvd_udf.c	2008-02-03 13:24:40.000000000 +0100
-@@ -39,6 +39,9 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <errno.h>
-+#ifndef __WIN32__
-+#include <fnmatch.h>
-+#endif
- 
- #if defined(HAVE_INTTYPES_H)
- #include <inttypes.h>
-@@ -50,6 +53,9 @@
- #include "dvd_udf.h"
- #include "dvdread_internal.h"
- 
-+#include "ifo_types.h"
-+#include "ifo_read.h"
-+
- #ifndef EMEDIUMTYPE
- #define EMEDIUMTYPE ENOENT
- #endif
-@@ -965,6 +971,80 @@
- uint32_t UDFFindFile( dvd_reader_t *device, char *filename,
-                       uint32_t *filesize )
- {
-+  uint32_t offset=0;
-+  if( filesize == NULL || *filesize < 1 || *filesize > 1073741824) {
-+     // only when filesize is invalid
-+#ifndef __WIN32__
-+     if (!fnmatch("/VIDEO_TS/VTS_0-90-9_0-9.???", filename, FNM_PATHNAME)) {
-+#else
-+     if (strlen("/VIDEO_TS/VTS_01_1.VOB") == strlen(filename)
-+         && !strncmp(filename, "/VIDEO_TS/VTS_", strlen("/VIDEO_TS/VTS_"))	) {
-+#endif
-+       size_t len = strlen(filename);
-+       char *extension = &filenamelen-3;
-+       if (!strcmp(extension, "IFO") || !strcmp(extension, "VOB")) {
-+         int title = atoi(&filenamelen-8);
-+         int part = atoi(&filenamelen-5);
-+
-+         ifo_handle_t *ifo_handle = ifoOpen(device, 0);
-+         if (0 == ifo_handle)
-+           return 0;
-+
-+         if (title > ifo_handle->tt_srpt->nr_of_srpts) {
-+           ifoClose(ifo_handle);
-+           return 0;
-+
-+         }
-+
-+         uint32_t tmp_filesize;
-+         offset += UDFFindFile(device, "/VIDEO_TS/VIDEO_TS.IFO", &tmp_filesize);
-+
-+
-+         int i;
-+         for (i=0; i<ifo_handle->tt_srpt->nr_of_srpts; i++)
-+           if (title == ifo_handle->tt_srpt->titlei.title_set_nr)
-+             break;
-+
-+         if (i == ifo_handle->tt_srpt->nr_of_srpts) {
-+           /* not found */
-+           ifoClose(ifo_handle);
-+           return 0;
-+         }
-+         offset += ifo_handle->tt_srpt->titlei.title_set_sector;
-+
-+         ifoClose(ifo_handle);
-+
-+         if (!strcmp(extension, "VOB")) {
-+           ifo_handle = ifoOpen(device, title);
-+           if (0 == ifo_handle)
-+             return 0;
-+
-+           switch(part) {
-+             case 0:
-+               if (0 == ifo_handle->vtsi_mat->vtsm_vobs)
-+                 return 0;
-+               offset += ifo_handle->vtsi_mat->vtsm_vobs;
-+               break;
-+             case 1:
-+               if (0 == ifo_handle->vtsi_mat->vtstt_vobs)
-+                 return 0;
-+               offset += ifo_handle->vtsi_mat->vtstt_vobs;
-+               break;
-+             default: /* can't get other parts (also no need to) */
-+               offset = 0;
-+               break;
-+           }
-+
-+           ifoClose(ifo_handle);
-+         }
-+
-+       }
-+
-+       *filesize = 1000000; /* File size unknown */
-+       if (offset != 0)
-+         return offset;
-+     }
-+  }
-   uint8_t *LogBlock;
-   uint32_t lbnum;
-   uint16_t TagID;