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

Remove multimedia/dvdcpy which was a subset of multimedia/ogmrip, in favour

Browse Source 
of a dvdcpy subpackage in ogmrip. Sync WANTLIB while there. ok jeremy@ pascal@
Missing @conflict marker in my PLIST-dvdcpy spotted by Mikolaj Kucharski.
This commit is contained in:
sthen 2013-01-11 22:20:11 +00:00
parent f289cb4e94
commit 2d5a9cf4fa
12 changed files with 35 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.63 2012/10/10 10:45:35 sthen Exp $
# $OpenBSD: Makefile,v 1.64 2013/01/11 22:20:11 sthen Exp $
SUBDIR =
SUBDIR += atomicparsley
@ -10,7 +10,6 @@
SUBDIR += devede
SUBDIR += dvdauthor
SUBDIR += dvdbackup
SUBDIR += dvdcpy
SUBDIR += dvdstyler
SUBDIR += ffmpeg-php
SUBDIR += ffmpeg2theora

40
multimedia/dvdcpy/Makefile
View File

@ -1,40 +0,0 @@
# $OpenBSD: Makefile,v 1.8 2012/05/03 06:51:24 ajacoutot Exp $
COMMENT= copy selected info from DVD
DISTNAME= ogmrip-0.10.0
PKGNAME= dvdcpy-0.10.0
REVISION= 1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ogmrip/}
HOMEPAGE= http://ogmrip.sourceforge.net/
MAINTAINER= Marc Espie <espie@openbsd.org>
# GPLv2
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB += c dvdread
WRKDIST= ${WRKDIR}/${DISTNAME}/dvdcpy
LIB_DEPENDS= devel/libdvdread
NO_REGRESS= Yes
do-configure:
@ln -sf ${FILESDIR}/config.h ${WRKDIST}
do-build:
${CC} ${CFLAGS} -I${LOCALBASE}/include \
${WRKSRC}/dvdcpy.c -o${WRKBUILD}/dvdcpy \
-L${LOCALBASE}/lib -ldvdread
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/dvdcpy ${PREFIX}/bin
${INSTALL_MAN} ${FILESDIR}/dvdcpy.1 ${PREFIX}/man/man1
.include <bsd.port.mk>

5
multimedia/dvdcpy/distinfo
View File

@ -1,5 +0,0 @@
MD5 (ogmrip-0.10.0.tar.gz) = zvgLd7VRpueszBRBtiwbSg==
RMD160 (ogmrip-0.10.0.tar.gz) = 1jmirbejAI2x9y+dgsDJWROTv4A=
SHA1 (ogmrip-0.10.0.tar.gz) = ckTVbZwhbvDmq5HmhdjmXswndOM=
SHA256 (ogmrip-0.10.0.tar.gz) = Wz0ntkzgfpnEB71x3i27XQHeTOLevNdJE6xyAZdpgc4=
SIZE (ogmrip-0.10.0.tar.gz) = 623001

6
multimedia/dvdcpy/files/config.h
View File

@ -1,6 +0,0 @@
/* $OpenBSD: config.h,v 1.1.1.1 2007/01/22 12:05:01 espie Exp $ */
#include <sys/param.h>
#include <sys/mount.h>
#define HAVE_INTTYPES_H
#define HAVE_STDINT_H

37
multimedia/dvdcpy/files/dvdcpy.1
View File

@ -1,37 +0,0 @@
.\" $OpenBSD: dvdcpy.1,v 1.2 2007/01/22 17:39:28 espie Exp $
.\" Public domain
.Dd January 20, 2007
.Dt DVDCPY 1
.Os
.Sh NAME
.Nm dvdcpy
.Nd copy selected data from dvd
.Sh SYNOPSIS
.Nm
.Op Fl hm
.Op Fl o Ar file
.Op Fl t Ar title ...
.Ar device
.Sh DESCRIPTION
The
.Nm
command copies selected titles and/or menu structure of a dvd inserted into
.Ar device .
The dvd does not have to be mounted.
The options are as follows:
.Bl -tag -width Flooutput
.It Fl h
Displays usage and quits.
.It Fl m
Selects menu structure for copy.
.It Fl o Ar output
Saves result into directory
.Ar output .
If not specified, default name is
.Pa backup .
The directory is created as needed.
.It Fl t Ar title
Selects title number
.Ar title
for copy.
.El

90
multimedia/dvdcpy/patches/patch-dvdcpy_c
View File

@ -1,90 +0,0 @@
$OpenBSD: patch-dvdcpy_c,v 1.1 2012/05/03 06:51:24 ajacoutot Exp $
Needed for libdvdread 4.2.0.
--- dvdcpy.c.orig Fri Dec 16 04:47:07 2011
+++ dvdcpy.c Fri Dec 16 04:48:13 2011
@@ -48,83 +48,6 @@
static ssize_t current_size, total_size;
-#if DVDREAD_VERSION < 905
-uint32_t UDFFindFile (dvd_reader_t *, const char *, uint32_t *);
-
-typedef struct
-{
- off_t size;
- int nr_parts;
- off_t parts_size[9];
-} dvd_stat_t;
-
-int
-DVDFileStat (dvd_reader_t *reader, int vts, dvd_read_domain_t domain, dvd_stat_t *statbuf)
-{
- char filename[FILENAME_MAX];
- uint32_t bytes;
-
- if (!reader)
- return -1;
-
- if (domain == DVD_READ_TITLE_VOBS && vts == 0)
- return -1;
-
- memset (statbuf, 0, sizeof (dvd_stat_t));
-
- if (domain == DVD_READ_TITLE_VOBS)
- {
- unsigned int vob;
-
- vob = 1;
- while (1)
- {
- snprintf (filename, FILENAME_MAX, "/VIDEO_TS/VTS_%02u_%u.VOB", vts, vob++);
- if (!UDFFindFile (reader, filename, &bytes))
- break;
- statbuf->size += (off_t) bytes;
- statbuf->parts_size[statbuf->nr_parts++] = (off_t) bytes;
- }
-
- if (vob == 1)
- return -1;
-
- return 0;
- }
-
- switch (domain)
- {
- case DVD_READ_INFO_FILE:
- if (vts == 0)
- strncpy (filename, "/VIDEO_TS/VIDEO_TS.IFO", FILENAME_MAX);
- else
- snprintf (filename, FILENAME_MAX, "/VIDEO_TS/VTS_%02u_0.IFO", vts);
- break;
- case DVD_READ_INFO_BACKUP_FILE:
- if (vts == 0)
- strncpy (filename, "/VIDEO_TS/VIDEO_TS.BUP", FILENAME_MAX);
- else
- snprintf (filename, FILENAME_MAX, "/VIDEO_TS/VTS_%02u_0.BUP", vts);
- break;
- case DVD_READ_MENU_VOBS:
- if (vts == 0)
- strncpy (filename, "/VIDEO_TS/VIDEO_TS.VOB", FILENAME_MAX);
- else
- snprintf (filename, FILENAME_MAX, "/VIDEO_TS/VTS_%02u_0.VOB", vts);
- break;
- case DVD_READ_TITLE_VOBS:
- break;
- }
-
- if (!UDFFindFile (reader, filename, &bytes))
- return -1;
-
- statbuf->size = (off_t) bytes;
-
- return 0;
-}
-#endif /* DVDREAD_VERSION */
-
static ssize_t
dvd_file_size (dvd_reader_t *reader, unsigned int vts, dvd_read_domain_t domain)
{

3
multimedia/dvdcpy/pkg/PLIST
View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PLIST,v 1.2 2012/05/03 06:51:24 ajacoutot Exp $
@bin bin/dvdcpy
@man man/man1/dvdcpy.1

41
multimedia/ogmrip/Makefile
View File

@ -1,11 +1,15 @@
# $OpenBSD: Makefile,v 1.3 2012/09/21 14:48:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.4 2013/01/11 22:20:12 sthen Exp $
SHARED_ONLY = Yes
COMMENT = DVD ripper/converter
COMMENT-main = DVD ripper/converter
COMMENT-dvdcpy = copy selected info from DVD
DISTNAME = ogmrip-0.13.8
REVISION = 0
V = 0.13.8
DISTNAME = ogmrip-$V
PKGNAME-main = ogmrip-$V
PKGNAME-dvdcpy = dvdcpy-$V
REVISION-main = 1
SHARED_LIBS += ogmdvd-gtk 0.0 # 1.0
SHARED_LIBS += ogmdvd 0.0 # 1.0
@ -15,6 +19,8 @@ SHARED_LIBS += ogmrip-lavc 0.0 # 1.0
SHARED_LIBS += ogmrip-mplayer 0.0 # 1.0
SHARED_LIBS += ogmrip 0.0 # 1.0
MULTI_PACKAGES = -main -dvdcpy
CATEGORIES = multimedia
HOMEPAGE = http://ogmrip.sourceforge.net/en/index.html
@ -27,14 +33,17 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo
WANTLIB += dbus-1 dbus-glib-1 drm dvdread enca enchant expat ffi
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glade-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 jpeg m notify ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += stdc++ theora tiff xcb xcb-render xcb-shm xml2 z
WANTLIB-main += ${WANTLIB} GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB-main += Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c
WANTLIB-main += cairo dvdread dbus-1 dbus-glib-1 drm enca enchant expat ffi
WANTLIB-main += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB-main += glade-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB-main += gtk-x11-2.0 jpeg m notify ogg pango-1.0 pangocairo-1.0
WANTLIB-main += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB-main += stdc++ theora tiff xcb xcb-render xcb-shm xml2 z
WANTLIB-main += harfbuzz icudata icule icuuc
WANTLIB-dvdcpy += c dvdread
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ogmrip/}
@ -43,7 +52,9 @@ MODULES = devel/gettext \
textproc/intltool
BUILD_DEPENDS = x11/mplayer \
textproc/gsed
RUN_DEPENDS = x11/mplayer \
RUN_DEPENDS-main = ${RUN_DEPENDS} \
STEM->=0.13.8:${PKGPATH},-dvdcpy \
x11/mplayer \
audio/lame \
multimedia/mkvtoolnix \
multimedia/ogmtools \
@ -52,7 +63,9 @@ RUN_DEPENDS = x11/mplayer \
graphics/gocr \
graphics/ocrad \
graphics/tesseract
LIB_DEPENDS = multimedia/libtheora \
LIB_DEPENDS-dvdcpy = devel/libdvdread
LIB_DEPENDS-main = ${LIB_DEPENDS} \
multimedia/libtheora \
devel/gconf2 \
devel/libglade2 \
devel/libnotify \

0
multimedia/dvdcpy/pkg/DESCR → multimedia/ogmrip/pkg/DESCR-dvdcpy
View File

0
multimedia/ogmrip/pkg/DESCR → multimedia/ogmrip/pkg/DESCR-main
View File

5
multimedia/ogmrip/pkg/PLIST-dvdcpy Normal file
View File

@ -0,0 +1,5 @@
@comment $OpenBSD: PLIST-dvdcpy,v 1.1 2013/01/11 22:20:12 sthen Exp $
@conflict ogmrip-<0.13.8p1
@pkgpath multimedia/dvdcpy
@bin bin/dvdcpy
@man man/man1/dvdcpy.1

5
multimedia/ogmrip/pkg/PLIST → multimedia/ogmrip/pkg/PLIST-main
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/06/26 11:46:06 pascal Exp $
@comment $OpenBSD: PLIST-main,v 1.1 2013/01/11 22:20:12 sthen Exp $
@pkgpath multimedia/ogmrip
@bin bin/avibox
@bin bin/dvdcpy
@bin bin/ogmrip
@bin bin/subp2pgm
bin/subp2png
@ -122,7 +122,6 @@ lib/pkgconfig/ogmjob.pc
lib/pkgconfig/ogmrip-gtk.pc
lib/pkgconfig/ogmrip.pc
@man man/man1/avibox.1
@man man/man1/dvdcpy.1
@man man/man1/subp2pgm.1
@man man/man1/subptools.1
share/applications/ogmrip.desktop