cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust for libdvdav update - quit using the libdvdnav version

Browse Source 
of libdvdread haders since they are no longer part of libdvdnav.
This commit is contained in:
jakemsr 2009-07-30 19:10:28 +00:00
parent e4a0560db9
commit fae605fb5a
2 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
multimedia/dvdbackup/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2007/09/16 03:24:28 merdely Exp $
# $OpenBSD: Makefile,v 1.7 2009/07/30 19:10:28 jakemsr Exp $
COMMENT= DVD ripper
DISTNAME= dvdbackup-0.1.1
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= multimedia
HOMEPAGE= http://dvd-create.sourceforge.net/
@ -16,8 +16,8 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://dvd-create.sourceforge.net/
LIB_DEPENDS= dvdnav.>=5::multimedia/libdvdnav
WANTLIB= c pthread
LIB_DEPENDS= dvdnav.>=6::multimedia/libdvdnav
WANTLIB= c dvdread pthread
NO_REGRESS= Yes

64
multimedia/dvdbackup/patches/patch-src_dvdbackup_c
View File

@ -1,22 +1,14 @@
$OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
--- src/dvdbackup.c.orig Mon Aug 5 08:08:17 2002
+++ src/dvdbackup.c Tue Oct 3 18:48:52 2006
@@ -30,11 +30,11 @@
$OpenBSD: patch-src_dvdbackup_c,v 1.3 2009/07/30 19:10:28 jakemsr Exp $
--- src/dvdbackup.c.orig Sun Aug 4 23:08:39 2002
+++ src/dvdbackup.c Mon Jul 13 16:58:47 2009
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <string.h>
#include <limits.h>
-#include <dvdread/dvd_reader.h>
-#include <dvdread/ifo_read.h>
-#include <dvdread/ifo_print.h>
+#include <dvdnav/dvd_reader.h>
+#include <dvdnav/ifo_read.h>
+#include <dvdnav/ifo_print.h>
+#include <dvdnav/dvd_udf.h>
-
#define MAXNAME 256
/*Flag for verbose mode */
+#include <stdint.h>
#include <dvdread/dvd_reader.h>
#include <dvdread/ifo_read.h>
#include <dvdread/ifo_print.h>
@@ -227,7 +227,8 @@ void usage(){
}
@ -27,7 +19,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
((size_array[reference] * 2 - size_array[target])/ size_array[target] == 1) &&
((size_array[reference]%size_array[target] * 3) < size_array[reference]) ) {
/* We have a dual DVD with two feature films - now lets see if they have the same amount of chapters*/
@@ -301,7 +302,7 @@ int DVDWriteCells(dvd_reader_t * dvd, in
@@ -301,7 +302,7 @@ int DVDWriteCells(dvd_reader_t * dvd, int cell_start_s
/* Vob control */
@ -36,7 +28,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
/* Temp filename,dirname */
char targetname[PATH_MAX];
@@ -313,9 +314,9 @@ int DVDWriteCells(dvd_reader_t * dvd, in
@@ -313,9 +314,9 @@ int DVDWriteCells(dvd_reader_t * dvd, int cell_start_s
/* File Handler */
int streamout;
@ -49,7 +41,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
/* Buffer size in DVD sectors */
/* Currently set to 1MB */
@@ -353,7 +354,7 @@ int DVDWriteCells(dvd_reader_t * dvd, in
@@ -353,7 +354,7 @@ int DVDWriteCells(dvd_reader_t * dvd, int cell_start_s
/* Remove all old files silently if they exists */
for ( i = 0 ; i < 10 ; i++ ) {
@ -58,7 +50,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
#ifdef DEBUG
fprintf(stderr,"DVDWriteCells: file is %s\n", targetname);
@@ -423,7 +424,7 @@ int DVDWriteCells(dvd_reader_t * dvd, in
@@ -423,7 +424,7 @@ int DVDWriteCells(dvd_reader_t * dvd, int cell_start_s
fprintf(stderr,"Don't try to copy chapters from the VMG domain there aren't any\n");
return(1);
} else {
@ -67,7 +59,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
}
#ifdef DEBUG
@@ -504,7 +505,7 @@ int DVDWriteCells(dvd_reader_t * dvd, in
@@ -504,7 +505,7 @@ int DVDWriteCells(dvd_reader_t * dvd, int cell_start_s
fprintf(stderr,"Don't try to copy chapters from the VMG domain there aren't any\n");
return(1);
} else {
@ -76,7 +68,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
}
@@ -602,7 +603,7 @@ titles_info_t * DVDGetInfo(dvd_reader_t
@@ -602,7 +603,7 @@ titles_info_t * DVDGetInfo(dvd_reader_t * _dvd) {
int counter, i, f;
/* Our guess */
@ -85,7 +77,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
int multi = 0;
int dual = 0;
@@ -1083,7 +1084,7 @@ int DVDCopyTileVobX(dvd_reader_t * dvd,
@@ -1083,7 +1084,7 @@ int DVDCopyTileVobX(dvd_reader_t * dvd, title_set_info
fprintf(stderr,"Don't try to copy a Title VOB from the VMG domain there aren't any\n");
return(1);
} else {
@ -94,7 +86,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
}
@@ -1217,9 +1218,9 @@ int DVDCopyMenu(dvd_reader_t * dvd, titl
@@ -1217,9 +1218,9 @@ int DVDCopyMenu(dvd_reader_t * dvd, title_set_info_t *
/* Create VIDEO_TS.VOB or VTS_XX_0.VOB */
if (title_set == 0) {
@ -106,7 +98,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
}
@@ -1330,9 +1331,9 @@ int DVDCopyIfoBup (dvd_reader_t * dvd, t
@@ -1330,9 +1331,9 @@ int DVDCopyIfoBup (dvd_reader_t * dvd, title_set_info_
/* Create VIDEO_TS.IFO or VTS_XX_0.IFO */
if (title_set == 0) {
@ -118,7 +110,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
}
if (stat(targetname, &fileinfo) == 0) {
@@ -1396,9 +1397,9 @@ int DVDCopyIfoBup (dvd_reader_t * dvd, t
@@ -1396,9 +1397,9 @@ int DVDCopyIfoBup (dvd_reader_t * dvd, title_set_info_
/* Create VIDEO_TS.BUP or VTS_XX_0.BUP */
if (title_set == 0) {
@ -130,7 +122,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
}
@@ -1518,7 +1519,7 @@ int DVDMirrorTitleX(dvd_reader_t * dvd,
@@ -1518,7 +1519,7 @@ int DVDMirrorTitleX(dvd_reader_t * dvd, title_set_info
int DVDGetTitleName(const char *device, char *title)
{
/* Variables for filehandel and title string interaction */
@ -139,7 +131,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
int filehandle, i, last;
/* Open DVD device */
@@ -1530,7 +1531,7 @@ int DVDGetTitleName(const char *device,
@@ -1530,7 +1531,7 @@ int DVDGetTitleName(const char *device, char *title)
/* Seek to title of first track, which is at (track_no * 32768) + 40 */
@ -148,7 +140,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
close(filehandle);
fprintf(stderr, "Can't seek DVD device %s - check your DVD device\n", device);
return(1);
@@ -1538,21 +1539,20 @@ int DVDGetTitleName(const char *device,
@@ -1538,21 +1539,20 @@ int DVDGetTitleName(const char *device, char *title)
/* Read the DVD-Video title */
@ -175,7 +167,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
if ( title[i] != ' ' ) { last = i; }
}
@@ -1687,7 +1687,7 @@ title_set_info_t *DVDGetFileSet(dvd_read
@@ -1687,7 +1687,7 @@ title_set_info_t *DVDGetFileSet(dvd_reader_t * _dvd) {
/* Find VIDEO_TS.IFO is present - must be present since we did a ifo open 0*/
@ -184,7 +176,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
if ( UDFFindFile(_dvd, filename, &size) != 0 ) {
title_set_info->title_set[0].size_ifo = size;
@@ -1700,7 +1700,7 @@ title_set_info_t *DVDGetFileSet(dvd_read
@@ -1700,7 +1700,7 @@ title_set_info_t *DVDGetFileSet(dvd_reader_t * _dvd) {
/* Find VIDEO_TS.VOB if present*/
@ -193,7 +185,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
if ( UDFFindFile(_dvd, filename, &size) != 0 ) {
title_set_info->title_set[0].size_menu = size;
@@ -1710,7 +1710,7 @@ title_set_info_t *DVDGetFileSet(dvd_read
@@ -1710,7 +1710,7 @@ title_set_info_t *DVDGetFileSet(dvd_reader_t * _dvd) {
/* Find VIDEO_TS.BUP if present */
@ -202,7 +194,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
if ( UDFFindFile(_dvd, filename, &size) != 0 ) {
title_set_info->title_set[0].size_bup = size;
@@ -1745,7 +1745,7 @@ title_set_info_t *DVDGetFileSet(dvd_read
@@ -1745,7 +1745,7 @@ title_set_info_t *DVDGetFileSet(dvd_reader_t * _dvd) {
}
@ -211,7 +203,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
if ( UDFFindFile(_dvd, filename, &size) != 0 ) {
title_set_info->title_set[counter + 1].size_ifo = size;
@@ -1761,7 +1761,7 @@ title_set_info_t *DVDGetFileSet(dvd_read
@@ -1761,7 +1761,7 @@ title_set_info_t *DVDGetFileSet(dvd_reader_t * _dvd) {
/* Find VTS_XX_0.VOB if present*/
@ -220,7 +212,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
if ( UDFFindFile(_dvd, filename, &size) != 0 ) {
title_set_info->title_set[counter + 1].size_menu = size;
@@ -1778,7 +1778,7 @@ title_set_info_t *DVDGetFileSet(dvd_read
@@ -1778,7 +1778,7 @@ title_set_info_t *DVDGetFileSet(dvd_reader_t * _dvd) {
/* Find all VTS_XX_[1 to 9].VOB files if they are present*/
for( i = 0; i < 9; ++i ) {
@ -229,7 +221,7 @@ $OpenBSD: patch-src_dvdbackup_c,v 1.2 2006/10/12 11:30:41 claudio Exp $
if(UDFFindFile(_dvd, filename, &size) == 0 ) {
break;
}
@@ -1791,7 +1791,7 @@ title_set_info_t *DVDGetFileSet(dvd_read
@@ -1791,7 +1791,7 @@ title_set_info_t *DVDGetFileSet(dvd_reader_t * _dvd) {
}