ports/81303: [MAINTAINER] multimedia/lxdvdrip: update to 1.44
Ulrich Spoerlein
q at galgenberg.net
Fri May 20 12:20:23 UTC 2005
>Number: 81303
>Category: ports
>Synopsis: [MAINTAINER] multimedia/lxdvdrip: update to 1.44
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri May 20 12:20:22 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 5.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD roadrunner 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Wed Mar 30 23:20:28 CEST 2005
>Description:
- Update to 1.44
- Apply patch from multimedia/lsdvd
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- lxdvdrip-1.44.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/lxdvdrip/Makefile,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile
--- Makefile 13 May 2005 20:17:25 -0000 1.2
+++ Makefile 20 May 2005 12:11:16 -0000
@@ -6,10 +6,9 @@
#
PORTNAME= lxdvdrip
-PORTVERSION= 1.41
+PORTVERSION= 1.44
CATEGORIES= multimedia
MASTER_SITES= http://download.berlios.de/lxdvdrip/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-3
EXTRACT_SUFX= .tgz
MAINTAINER= q at galgenberg.net
@@ -24,11 +23,14 @@
do-build:
(cd ${WRKSRC}; ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \
- -ldvdread -lm -o lxdvdrip lxdvdrip.c)
+ -ldvdread -lm -o lxdvdrip lxdvdrip.c; \
+ ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lm -o lxac3scan \
+ lxac3scan.c)
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/lxdvdrip ${LOCALBASE}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.* ${LOCALBASE}/etc
+ ${INSTALL_PROGRAM} ${WRKSRC}/lxdvdrip ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/lxac3scan ${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/doc-pak/lxdvdrip.conf.* ${PREFIX}/etc
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/doc-pak && ${CP} Changelog* README.* TODO freebsd.doc ${DOCSDIR}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/multimedia/lxdvdrip/distinfo,v
retrieving revision 1.1
diff -u -u -r1.1 distinfo
--- distinfo 29 Jan 2005 15:00:19 -0000 1.1
+++ distinfo 20 May 2005 12:11:16 -0000
@@ -1,2 +1,2 @@
-MD5 (lxdvdrip-1.41-3.tgz) = bd325a8a4a5519a2146a2ca9ecfea3b3
-SIZE (lxdvdrip-1.41-3.tgz) = 456578
+MD5 (lxdvdrip-1.44.tgz) = 72fc99caa6c98989ab1fb49da282547d
+SIZE (lxdvdrip-1.44.tgz) = 466199
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/multimedia/lxdvdrip/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist 29 Jan 2005 15:00:19 -0000 1.1
+++ pkg-plist 20 May 2005 12:11:16 -0000
@@ -1,4 +1,5 @@
bin/lxdvdrip
+bin/lxac3scan
etc/lxdvdrip.conf.DE
etc/lxdvdrip.conf.EN
etc/lxdvdrip.conf.FR
Index: files/patch-lxdvdrip.c
===================================================================
RCS file: /home/ncvs/ports/multimedia/lxdvdrip/files/patch-lxdvdrip.c,v
retrieving revision 1.1
diff -u -u -r1.1 patch-lxdvdrip.c
--- files/patch-lxdvdrip.c 29 Jan 2005 15:00:20 -0000 1.1
+++ files/patch-lxdvdrip.c 20 May 2005 12:11:16 -0000
@@ -1,94 +1,33 @@
---- lxdvdrip.c.orig Wed Jan 12 23:31:49 2005
-+++ lxdvdrip.c Wed Jan 26 21:31:51 2005
-@@ -229,6 +229,11 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#ifndef __FreeBSD__
-+#include <sys/statfs.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -621,16 +626,19 @@
- // Gibt die Groesse einer Datei zurueck, ohne die stat Beschraenkung auf < 2 GB
- long long filesize64 (char * szFileName)
- {
-+#ifdef __FreeBSD__
-+ struct stat buf;
-+
-+ if (stat(szFileName, &buf) < 0)
-+ return 0LL;
-+
-+ return buf.st_size;
-+#else
- FILE * fp;
- long long lSize;
- char szBuffer[128];
- char szTempl[32] = "/tmp/groesse.lxdvdrip";
--// FreeBSD hat fopen64 als Standard
--#ifdef _FREEBSD
-- fp = (FILE*)fopen (szFileName, "rb");
--#else
- fp = (FILE*)fopen64 (szFileName, "rb");
--#endif
- if (!fp)
- {
- return (long long)0;
-@@ -644,39 +652,28 @@
- system ("rm /tmp/groesse.lxdvdrip");
- lSize = atoll (szBuffer);
- return lSize;
-+#endif
- }
+--- lxdvdrip.c.orig Thu May 5 16:25:21 2005
++++ lxdvdrip.c Thu May 5 16:32:23 2005
+@@ -742,7 +742,7 @@
+ return -1;
+ }
- // Berechnet freien Festplattenplatz
- long long calculate_discfree (char * szPfad, long lSprache)
- {
-- char szTempl[32] = "/tmp/lxdf.lxdvdrip";
-- char szBefehl[1024];
-+ struct statfs buf;
- long long lGroesse=0;
-- sprintf (szBefehl, "stat -f %s -c ", szPfad);
-- strcat (szBefehl, "'%a %s' > ");
-- strcat (szBefehl, szTempl);
-- if (system (szBefehl) == 0)
-+
-+ if (statfs(szPfad, &buf) < 0)
-+ return 0;
-+
-+ lGroesse = buf.f_bavail*buf.f_bsize;
+- if (fseek (filehandle, 32808, SEEK_SET))
++ if (fseek (filehandle, 32768, SEEK_SET))
+ {
+ fclose (filehandle);
+ switch (lSprache)
+@@ -762,7 +762,10 @@
+ return -1;
+ }
+
+- if (32 != (i = fread (title, 1, 32, filehandle)))
++#define DVD_SEC_SIZ 2048
++ char tempBuf[DVD_SEC_SIZ];
+
-+ switch (lSprache)
- {
-- FILE * fTmp;
-- long long lFrei;
-- long long lBlockGroesse;
-- fTmp = fopen(szTempl,"r");
-- if (fTmp)
-- {
-- fscanf (fTmp, "%lld %lld", &lFrei, &lBlockGroesse);
-- fclose (fTmp);
-- lGroesse = lFrei * lBlockGroesse;
-- }
-- system ("rm /tmp/lxdf.lxdvdrip");
-- switch (lSprache)
-- {
-- case 0: printf ("Frei in %s: %lld Bytes\n", szPfad, lGroesse);
-- break;
-- case 1: printf ("Free in %s: %lld Bytes\n", szPfad, lGroesse);
-- break;
-- case 2: printf ("Espace libre sur %s: %lld octets\n", szPfad, lGroesse);
-- break;
-- }
-+ case 0: printf ("Frei in %s: %lld Bytes\n", szPfad, lGroesse);
-+ break;
-+ case 1: printf ("Free in %s: %lld Bytes\n", szPfad, lGroesse);
-+ break;
-+ case 2: printf ("Espace libre sur %s: %lld octets\n", szPfad, lGroesse);
-+ break;
- }
- return lGroesse;
- }
++ if (DVD_SEC_SIZ != fread (tempBuf, 1, DVD_SEC_SIZ, filehandle))
+ {
+ fclose (filehandle);
+ switch (lSprache)
+@@ -780,7 +783,8 @@
+ strcpy (title, "unknown");
+ return -1;
+ }
+-
++ snprintf( title, 32, "%s", tempBuf + 40 );
++ i=32;
+ fclose (filehandle);
+
+ title[32] = '\0';
--- lxdvdrip-1.44.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list