Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 7

dvdbackup.changes Changed

dvdbackup.spec Changed

@@ -1,26 +1,36 @@
-# Packmangroup: Multimedia
-# Packmanpackagename: dvdbackup
-# Packman: Manfred Tremmel
-# Packmandepends: libdvdread
-# Packmanpackagedesc: <p>dvdbackup is a utility to make a 1:1 copy of a dvd</p>
-# Packmanpackagedesc_de: <p>dvdbackup ist ein Hilfsprogramm zur Erstellung einer 1:1 Kopie einer dvd</p>
+#
+# spec file for package dvdbackup
+#
+# Copyright (c) 2020 Packman Team <packman@links2linux.de>
+# Copyright (c) 2005-2012 Manfred Tremmel <Manfred.Tremmel@iiv.de>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
+#
 
-# norootforbuild
 
 Name:           dvdbackup
-Summary:        Dvdbackup is a dvd backup utility
-Summary(de):    Dvdbackup ist ein dvd Backup Hilfsprogramm
-License:        GPL-3.0+
-Group:          Productivity/Multimedia/Video/Editors and Convertors
-URL:            http://sourceforge.net/projects/dvdbackup/
 Version:        0.4.2
-Release:        1
-Source0:        %{name}-%{version}.tar.bz2
-Patch0:         %{name}-%{version}-libdvdread4.diff
-Patch1:         %{name}-%{version}-automake1_12.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-build
+Release:        0
+Summary:        A DVD backup utility
+Summary(de):    Ein DVD Backup Hilfsprogramm
+License:        GPL-3.0-or-later
+Group:          Productivity/Multimedia/Video/Editors and Convertors
+URL:            https://sourceforge.net/projects/dvdbackup/
+Source0:        https://downloads.sourceforge.net/dvdbackup/%{name}-%{version}.tar.xz
+Patch1:         dvdbackup-0.4.2-automake1_12.diff
+Patch2:         dvdbackup-0.4.2-libdvdread6.patch
+BuildRequires:  automake
 BuildRequires:  libdvdread-devel
-BuildRequires:  autoconf automake libtool
+BuildRequires:  libtool
 
 %description
 dvdbackup is a utility to make a 1:1 copy of a dvd
@@ -28,45 +38,28 @@
 %description -l de
 dvdbackup ist ein Hilfsprogramm zur Erstellung einer 1:1 Kopie einer dvd
 
-%prep
-%setup -n %{name}-%{version}
-%patch0 -p1
+%lang_package
 
-# old automake does not know about AM_PROG_AR, new automake seems to need it :-(
-%if 0%{?suse_version} > 1210
-%patch1 -p1
-%endif
+%prep
+%autosetup -p1
 
 %build
-autoreconf -vfi
+autoreconf -fiv
 %configure
 
-%{__make} %{?jobs:-j%{jobs}}
+%make_build
 
 %install
-%makeinstall
-%{__rm} -rf %{buildroot}%{_datadir}/doc
-
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
+%make_install
+%find_lang %{name} -f %{name}.lang
+rm -rf %{buildroot}%{_datadir}/doc
 
 %files
-%defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%license COPYING
+%doc AUTHORS NEWS README
 %{_bindir}/dvdbackup
-%{_datadir}/man/man1/dvdbackup*
-%lang(da) %{_datadir}/locale/da/LC_MESSAGES/dvdbackup.mo
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/dvdbackup.mo
-%lang(en) %{_datadir}/locale/en*/LC_MESSAGES/dvdbackup.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/dvdbackup.mo
-%lang(et) %{_datadir}/locale/et/LC_MESSAGES/dvdbackup.mo
-%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/dvdbackup.mo
-%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/dvdbackup.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/dvdbackup.mo
-%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/dvdbackup.mo
-%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/dvdbackup.mo
-%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/dvdbackup.mo
-%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/dvdbackup.mo
-%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/dvdbackup.mo
+%{_mandir}/man1/dvdbackup.1%{?ext_man}
+
+%files lang -f %{name}.lang
 
 %changelog

dvdbackup-0.4.2-libdvdread4.diff -> dvdbackup-0.4.2-libdvdread6.patch Changed

@@ -1,238 +1,79 @@
-diff -uNr dvdbackup-0.4.2.orig/compat/compat.h dvdbackup-0.4.2/compat/compat.h
---- dvdbackup-0.4.2.orig/compat/compat.h	1970-01-01 01:00:00.000000000 +0100
-+++ dvdbackup-0.4.2/compat/compat.h	2012-07-29 21:27:57.447439671 +0200
-@@ -0,0 +1,38 @@
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifndef HAVE_DVDFILESTAT
-+typedef struct {
-+  off_t size;          /**< Total size of file in bytes */
-+  int nr_parts;        /**< Number of file parts */
-+  off_t parts_size[9]; /**< Size of each part in bytes */
-+} dvd_stat_t;
-+
-+/**
-+ * Stats a file on the DVD given the title number and domain.
-+ * The information about the file is stored in a dvd_stat_t
-+ * which contains information about the size of the file and
-+ * the number of parts in case of a multipart file and the respective
-+ * sizes of the parts.
-+ * A multipart file is for instance VTS_02_1.VOB, VTS_02_2.VOB, VTS_02_3.VOB
-+ * The size of VTS_02_1.VOB will be stored in stat->parts_size[0],
-+ * VTS_02_2.VOB in stat->parts_size[1], ...
-+ * The total size (sum of all parts) is stored in stat->size and
-+ * stat->nr_parts will hold the number of parts.
-+ * Only DVD_READ_TITLE_VOBS (VTS_??_[1-9].VOB) can be multipart files.
-+ * 
-+ * This function is only of use if you want to get the size of each file
-+ * in the filesystem. These sizes are not needed to use any other
-+ * functions in libdvdread. 
-+ *
-+ * @param dvd  A dvd read handle.
-+ * @param titlenum Which Video Title Set should be used, VIDEO_TS is 0.
-+ * @param domain Which domain. 
-+ * @param stat Pointer to where the result is stored.
-+ * @return If successful 0, otherwise -1.
-+ *
-+ * int DVDFileStat(dvd, titlenum, domain, stat);
-+ */
-+int DVDFileStat(dvd_reader_t *, int, dvd_read_domain_t, dvd_stat_t *);
-+#endif
-diff -uNr dvdbackup-0.4.2.orig/compat/DVDFileStat.c dvdbackup-0.4.2/compat/DVDFileStat.c
---- dvdbackup-0.4.2.orig/compat/DVDFileStat.c	1970-01-01 01:00:00.000000000 +0100
-+++ dvdbackup-0.4.2/compat/DVDFileStat.c	2012-07-29 21:27:57.446439698 +0200
-@@ -0,0 +1,107 @@
-+#include <config.h>
-+#include <stdio.h>
-+#include <errno.h>
-+#include <limits.h>
-+#include <sys/stat.h>
-+
-+#include <dvdread/dvd_reader.h>
-+#include <dvdread/dvd_udf.h>
-+
-+#include "compat.h"
-+
-+static int DVDFileStatVOBUDF(dvd_reader_t *dvd, int title, 
-+                             int menu, dvd_stat_t *statbuf)
-+{
-+  char filename[ MAX_UDF_FILE_NAME_LEN ];
-+  uint32_t size;
-+  off_t tot_size;
-+  off_t parts_size[9];
-+  int nr_parts = 0;
-+  int n;
-+ 
-+  if( title == 0 ) {
-+    sprintf( filename, "/VIDEO_TS/VIDEO_TS.VOB" );
-+  } else {
-+    sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
-+  }
-+  if(!UDFFindFile( dvd, filename, &size )) {
-+    return -1;
-+  }
-+  tot_size = size;
-+  nr_parts = 1;
-+  parts_size[0] = size;
-+
-+  if( !menu ) {
-+    int cur;
-+
-+    for( cur = 2; cur < 10; cur++ ) {
-+      sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, cur );
-+      if( !UDFFindFile( dvd, filename, &size ) ) {
-+        break;
-+      }
-+      parts_size[nr_parts] = size;
-+      tot_size += size;
-+      nr_parts++;
-+    }
-+  }
-+  
-+  statbuf->size = tot_size;
-+  statbuf->nr_parts = nr_parts;
-+  for(n = 0; n < nr_parts; n++) {
-+    statbuf->parts_size[n] = parts_size[n];
-+  }
-+  return 0;
-+}
-+
-+int DVDFileStat(dvd_reader_t *dvd, int titlenum, 
-+                dvd_read_domain_t domain, dvd_stat_t *statbuf)
-+{
-+  char filename[ MAX_UDF_FILE_NAME_LEN ];
-+  char full_path[ PATH_MAX + 1 ];
-+  struct stat fileinfo;
-+  uint32_t size;
-+
-+  /* Check arguments. */
-+  if( dvd == NULL || titlenum < 0 ) {
-+    errno = EINVAL;
-+    return -1;
-+  }
-+
-+  switch( domain ) {
-+  case DVD_READ_INFO_FILE:
-+    if( titlenum == 0 ) {
-+      sprintf( filename, "/VIDEO_TS/VIDEO_TS.IFO" );
-+    } else {
-+      sprintf( filename, "/VIDEO_TS/VTS_%02i_0.IFO", titlenum );
-+    }
-+    break;
-+  case DVD_READ_INFO_BACKUP_FILE:
-+    if( titlenum == 0 ) {
-+      sprintf( filename, "/VIDEO_TS/VIDEO_TS.BUP" );
-+    } else {
-+      sprintf( filename, "/VIDEO_TS/VTS_%02i_0.BUP", titlenum );
-+    }
-+    break;
-+  case DVD_READ_MENU_VOBS:
-+    return DVDFileStatVOBUDF( dvd, titlenum, 1, statbuf );
-+    break;
-+  case DVD_READ_TITLE_VOBS:
-+    if( titlenum == 0 ) {
-+      return -1;
-+    }
-+    return DVDFileStatVOBUDF( dvd, titlenum, 0, statbuf );
-+    break;
-+  default:
-+    fprintf( stderr, "libdvdread: Invalid domain for file stat.\n" );
-+    errno = EINVAL;
-+    return -1;
-+  }
-+  
-+  if( UDFFindFile( dvd, filename, &size ) ) {
-+    statbuf->size = size;
-+    statbuf->nr_parts = 1;
-+    statbuf->parts_size[0] = size;
-+    return 0;
-+  }
-+  return -1;
-+}
-diff -uNr dvdbackup-0.4.2.orig/compat/Makefile.am dvdbackup-0.4.2/compat/Makefile.am
---- dvdbackup-0.4.2.orig/compat/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ dvdbackup-0.4.2/compat/Makefile.am	2012-07-29 21:27:57.446439698 +0200
-@@ -0,0 +1,4 @@
-+noinst_LIBRARIES = libcompat.a
-+
-+libcompat_a_SOURCES =
-+libcompat_a_LIBADD = $(LIBOBJS)
-diff -uNr dvdbackup-0.4.2.orig/configure.ac dvdbackup-0.4.2/configure.ac
---- dvdbackup-0.4.2.orig/configure.ac	2012-06-24 03:47:43.000000000 +0200
-+++ dvdbackup-0.4.2/configure.ac	2012-07-29 21:27:57.447439671 +0200
-@@ -26,6 +26,7 @@
+Index: dvdbackup-0.4.2/src/dvdbackup.c
+===================================================================
+--- dvdbackup-0.4.2.orig/src/dvdbackup.c
++++ dvdbackup-0.4.2/src/dvdbackup.c
+@@ -1132,7 +1132,7 @@ static int DVDCopyIfoBup(dvd_reader_t* d
+ 	int size;
  
- AC_PROG_CC_C99
- AC_PROG_LN_S
-+AC_PROG_RANLIB
+ 	/* DVD handler */
+-	ifo_handle_t* ifo_file = NULL;
++	dvd_file_t* ifo_file = NULL;
  
- dnl ----------------------------------------------------------
- dnl Set build flags based on environment
-@@ -54,8 +55,12 @@
- dnl ----------------------------------------------------------
  
- AC_CHECK_LIB(dvdread, DVDOpen, , AC_MSG_ERROR([You need libdvdread]))
--AC_CHECK_LIB(dvdread, DVDFileStat, [HAVE_DVDFileStat=yes], AC_MSG_ERROR([You have installed an incompatible version of libdvdread.
--Have a look at http://dvdbackup.sourceforge.net for more details.]))
-+
-+AC_CONFIG_LIBOBJ_DIR([compat])
-+saved_LIBS="$LIBS"
-+LIBS="-ldvdread"
-+AC_REPLACE_FUNCS([DVDFileStat])
-+LIBS="$saved_LIBS"
+ 	if (title_set_info->number_of_title_sets + 1 < title_set) {
+@@ -1191,7 +1191,7 @@ static int DVDCopyIfoBup(dvd_reader_t* d
+ 	if ((streamout_bup = open(targetname_bup, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1) {
+ 		fprintf(stderr, _("Error creating %s\n"), targetname_bup);
+ 		perror(PACKAGE);
+-		ifoClose(ifo_file);

dvdbackup-0.4.2.tar.xz Renamed