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

Update to libdvdread-4.2.0.

Browse Source 
from Brad, ok sthen@
This commit is contained in:
ajacoutot 2012-05-03 06:51:07 +00:00
parent 82428b7e72
commit b2490555a3
12 changed files with 171 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
devel/libdvdread/Makefile
View File

@ -1,34 +1,37 @@
#$OpenBSD: Makefile,v 1.19 2010/11/15 19:45:59 espie Exp $
CATEGORIES = devel
#$OpenBSD: Makefile,v 1.20 2012/05/03 06:51:07 ajacoutot Exp $
COMMENT = accessing DVD files
DISTNAME = libdvdread-0.9.7
REVISION = 1
HOMEPAGE = http://www.dtek.chalmers.se/groups/dvd/
MASTER_SITES = ${HOMEPAGE}dist/
SHARED_ONLY = Yes
MAINTAINER = Marc Espie <espie@openbsd.org>
COMMENT = accessing DVD files
CONFIGURE_STYLE = gnu
USE_LIBTOOL = Yes
FLAVORS = debugcss
FLAVOR ?=
DISTNAME = libdvdread-4.2.0
CATEGORIES = devel
MASTER_SITES = ${HOMEPAGE}releases/
EXTRACT_SUFX = .tar.bz2
.if ${FLAVOR:L:Mdebugcss}
CFLAGS += -DDEBUG_CSS
RUN_DEPENDS = converters/libdvdcss
.else
RUN_DEPENDS = converters/libdvd
.endif
SHARED_LIBS += dvdread 5.0
SHARED_LIBS += dvdread 4.3 # .5.1
HOMEPAGE = http://dvdnav.mplayerhq.hu/
# GPL
MAINTAINER = Marc Espie <espie@openbsd.org>
# GPLv2+
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
SEPARATE_BUILD = Yes
RUN_DEPENDS = converters/libdvdcss>=1.2.12
MAKE_ENV = LIBDVDREAD_VERSION=${LIBdvdread_VERSION}
USE_GMAKE = Yes
CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = configure2
CONFIGURE_ARGS =--prefix="${PREFIX}" \
--cc="${CC}" \
--extra-cflags="${CFLAGS}" \
--disable-debug \
--disable-opts
.include <bsd.port.mk>

10
devel/libdvdread/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libdvdread-0.9.7.tar.gz) = B4eIySQa4WdjUp4SNVAjNw==
RMD160 (libdvdread-0.9.7.tar.gz) = cjMGTzXYaicgLKG+8WX2ly4gs+g=
SHA1 (libdvdread-0.9.7.tar.gz) = ssLt42z/nVYgV0fTdAxQ/TJmniE=
SHA256 (libdvdread-0.9.7.tar.gz) = 4B9wy6XPvFd7hTrmnXPwDbcWHhcE3CNZxDd6rEIyoYQ=
SIZE (libdvdread-0.9.7.tar.gz) = 389113
MD5 (libdvdread-4.2.0.tar.bz2) = q3oZ06saQ3rnVO9HfWIxpA==
RMD160 (libdvdread-4.2.0.tar.bz2) = cZU/Eug0qdIv9M+eJaOUnEMRdMA=
SHA1 (libdvdread-4.2.0.tar.bz2) = QxvJIZXydnO/3SvmfOD1gzjajTs=
SHA256 (libdvdread-4.2.0.tar.bz2) = C+oV2oQqSwSkgrAJ1y3MbZyVJMzBv2fldIMZ7FragJc=
SIZE (libdvdread-4.2.0.tar.bz2) = 97469

74
devel/libdvdread/patches/patch-Makefile Normal file
View File

@ -0,0 +1,74 @@
$OpenBSD: patch-Makefile,v 1.1 2012/05/03 06:51:07 ajacoutot Exp $
--- Makefile.orig Wed Dec 31 03:43:03 2008
+++ Makefile Fri Dec 16 03:45:55 2011
@@ -16,7 +16,7 @@ CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H
L=libdvdread
DVDREAD_L=libdvdread
DVDREAD_LIB = $(DVDREAD_L).a
-DVDREAD_SHLIB = $(DVDREAD_L).so
+DVDREAD_SHLIB = $(DVDREAD_L).so.$(LIBDVDREAD_VERSION)
VPATH+= $(SRC_PATH_BARE)/src
DVDREAD_HEADERS = src/dvdread/dvd_reader.h \
src/dvdread/ifo_print.h \
@@ -47,13 +47,13 @@ DVDREAD_DEPS= ${DVDREAD_OBJS:%.o=%.d}
BUILDDEPS = Makefile config.mak
ifeq ($(BUILD_SHARED),yes)
-all: $(SHLIB) $(DVDREAD_SHLIB) dvdread-config pkgconfig
-install: $(SHLIB) $(DVDREAD_SHLIB) install-shared install-dvdread-config install-pkgconfig
+all: $(DVDREAD_SHLIB) dvdread-config pkgconfig
+install: $(DVDREAD_SHLIB) install-shared install-dvdread-config install-pkgconfig
endif
ifeq ($(BUILD_STATIC),yes)
-all: $(LIB) $(DVDREAD_LIB) dvdread-config pkgconfig
-install: $(LIB) $(DVDREAD_LIB) install-static install-dvdread-config install-pkgconfig
+all: $(DVDREAD_LIB) dvdread-config pkgconfig
+install: $(DVDREAD_LIB) install-static install-dvdread-config install-pkgconfig
endif
install: install-headers
@@ -78,7 +78,7 @@ ${DVDREAD_LIB}: version.h $(DVDREAD_OBJS) $(BUILDDEPS)
cd $(.OBJDIR) && $(RANLIB) $@
${DVDREAD_SHLIB}: version.h $(DVDREAD_SHOBJS) $(BUILDDEPS)
- cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) $(LDFLAGS) -ldl -Wl,-soname=$(DVDREAD_SHLIB).$(SHLIB_MAJOR) -o $@ $(DVDREAD_SHOBJS)
+ cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -fPIC $(LDFLAGS) -o $@ $(DVDREAD_SHOBJS)
.c.so: $(BUILDDEPS)
cd $(.OBJDIR) && $(CC) -fPIC -DPIC -MD $(CFLAGS) -c -o $@ $<
@@ -93,29 +93,16 @@ install-headers:
install -d $(DESTDIR)$(dvdread_incdir)
install -m 644 $(DVDREAD_HEADERS) $(DESTDIR)$(dvdread_incdir)
-install-shared: $(SHLIB)
+install-shared: $(DVDREAD_SHLIB)
install -d $(DESTDIR)$(shlibdir)
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(SHLIB) \
- $(DESTDIR)$(shlibdir)/$(SHLIB).$(SHLIB_VERSION)
+ install -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \
+ $(DESTDIR)$(shlibdir)
- cd $(DESTDIR)$(shlibdir) && \
- ln -sf $(SHLIB).$(SHLIB_VERSION) $(SHLIB).$(SHLIB_MAJOR)
- cd $(DESTDIR)$(shlibdir) && \
- ln -sf $(SHLIB).$(SHLIB_MAJOR) $(SHLIB)
-
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \
- $(DESTDIR)$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION)
- cd $(DESTDIR)$(shlibdir) && \
- ln -sf $(DVDREAD_SHLIB).$(SHLIB_VERSION) $(DVDREAD_SHLIB).$(SHLIB_MAJOR)
- cd $(DESTDIR)$(shlibdir) && \
- ln -sf $(DVDREAD_SHLIB).$(SHLIB_MAJOR) $(DVDREAD_SHLIB)
-
-install-static: $(LIB)
+install-static: $(DVDREAD_LIB)
install -d $(DESTDIR)$(libdir)
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(LIB) $(DESTDIR)$(libdir)/$(LIB)
- install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(DESTDIR)$(libdir)/$(DVDREAD_LIB)
+ install -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(DESTDIR)$(libdir)/$(DVDREAD_LIB)
# Clean targets

20
devel/libdvdread/patches/patch-configure2 Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-configure2,v 1.1 2012/05/03 06:51:07 ajacoutot Exp $
Fix the big endian check to actually define WORDS_BIGENDIAN in the config.h header.
--- configure2.orig Mon Apr 30 01:24:09 2012
+++ configure2 Mon Apr 30 01:25:07 2012
@@ -149,7 +149,12 @@ cat > config.h << EOF
/* Automatically generated by configure, do not edit */
#include "version.h"
EOF
-test "$bigendian" = "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h
+if test "$bigendian" = "yes"
+then
+ echo "#define WORDS_BIGENDIAN" >> config.h
+else
+ echo "#undef WORDS_BIGENDIAN" >> config.h
+fi
# build tree in object directory if source path is different from current one
if test "$source_path_used" != "no"; then

12
devel/libdvdread/patches/patch-dvdread_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-dvdread_Makefile_in,v 1.1 2008/07/24 09:37:26 jakemsr Exp $
--- dvdread/Makefile.in.orig Thu Jul 17 23:53:21 2008
+++ dvdread/Makefile.in Fri Jul 18 00:05:22 2008
@@ -190,7 +190,7 @@ libdvdread_la_SOURCES = dvd_input.c dvd_reader.c dvd_u
md5.c md5.h
libdvdread_la_LIBADD = @DL_LIBS@ @CSS_LIBS@
-libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*)"
+libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*|UDFFindFile)"
pkginclude_HEADERS = dvd_reader.h ifo_types.h ifo_read.h \
ifo_print.h nav_types.h nav_read.h nav_print.h cmd_print.h

299
devel/libdvdread/patches/patch-dvdread_dvd_input_c
View File

@ -1,299 +0,0 @@
$OpenBSD: patch-dvdread_dvd_input_c,v 1.8 2008/07/24 09:37:26 jakemsr Exp $
--- dvdread/dvd_input.c.orig Mon Sep 19 06:43:08 2005
+++ dvdread/dvd_input.c Thu Jul 17 23:43:16 2008
@@ -45,30 +45,30 @@ int (*dvdinput_read) (dvd_input_t, void *, in
char * (*dvdinput_error) (dvd_input_t);
#ifdef HAVE_DVDCSS_DVDCSS_H
-/* linking to libdvdcss */
-#include <dvdcss/dvdcss.h>
-#define DVDcss_open(a) dvdcss_open((char*)(a))
-#define DVDcss_close dvdcss_close
-#define DVDcss_seek dvdcss_seek
-#define DVDcss_title dvdcss_title
-#define DVDcss_read dvdcss_read
-#define DVDcss_error dvdcss_error
+/* linking to dvdcss */
+#include <libdvd/libdvd.h>
+#define DVD_open(a) libdvd_open((char*)(a))
+#define DVD_close libdvd_close
+#define DVD_seek libdvd_seek
+#define DVD_title libdvd_title
+#define DVD_read libdvd_read
+#define DVD_error libdvd_error
#else
-/* dlopening libdvdcss */
+/* dlopening dvdcss */
#include <dlfcn.h>
-typedef struct dvdcss_s *dvdcss_handle;
-static dvdcss_handle (*DVDcss_open) (const char *);
-static int (*DVDcss_close) (dvdcss_handle);
-static int (*DVDcss_seek) (dvdcss_handle, int, int);
-static int (*DVDcss_title) (dvdcss_handle, int);
-static int (*DVDcss_read) (dvdcss_handle, void *, int, int);
-static char * (*DVDcss_error) (dvdcss_handle);
+typedef struct libdvd_s *libdvd_handle;
+static libdvd_handle (*DVD_open) (const char *);
+static int (*DVD_close) (libdvd_handle);
+static int (*DVD_seek) (libdvd_handle, int, int);
+static int (*DVD_title) (libdvd_handle, int);
+static int (*DVD_read) (libdvd_handle, void *, int, int);
+static char * (*DVD_error) (libdvd_handle);
#endif
/* The DVDinput handle, add stuff here for new input methods. */
struct dvd_input_s {
- /* libdvdcss handle */
- dvdcss_handle dvdcss;
+ /* dvdcss handle */
+ libdvd_handle libdvd;
/* dummy file input */
int fd;
@@ -78,7 +78,7 @@ struct dvd_input_s {
/**
* initialize and open a DVD device or file.
*/
-static dvd_input_t css_open(const char *target)
+static dvd_input_t libdvd_open(const char *target)
{
dvd_input_t dev;
@@ -89,9 +89,9 @@ static dvd_input_t css_open(const char *target)
return NULL;
}
- /* Really open it with libdvdcss */
- dev->dvdcss = DVDcss_open(target);
- if(dev->dvdcss == 0) {
+ /* Really open it with dvdcss */
+ dev->libdvd = DVD_open(target);
+ if(dev->libdvd == 0) {
free(dev);
dev = NULL;
}
@@ -102,44 +102,44 @@ static dvd_input_t css_open(const char *target)
/**
* return the last error message
*/
-static char *css_error(dvd_input_t dev)
+static char *libdvd_error(dvd_input_t dev)
{
- return DVDcss_error(dev->dvdcss);
+ return DVD_error(dev->libdvd);
}
/**
* seek into the device.
*/
-static int css_seek(dvd_input_t dev, int blocks)
+static int libdvd_seek(dvd_input_t dev, int blocks)
{
/* DVDINPUT_NOFLAGS should match the DVDCSS_NOFLAGS value. */
- return DVDcss_seek(dev->dvdcss, blocks, DVDINPUT_NOFLAGS);
+ return DVD_seek(dev->libdvd, blocks, DVDINPUT_NOFLAGS);
}
/**
* set the block for the begining of a new title (key).
*/
-static int css_title(dvd_input_t dev, int block)
+static int libdvd_title(dvd_input_t dev, int block)
{
- return DVDcss_title(dev->dvdcss, block);
+ return DVD_title(dev->libdvd, block);
}
/**
* read data from the device.
*/
-static int css_read(dvd_input_t dev, void *buffer, int blocks, int flags)
+static int libdvd_read(dvd_input_t dev, void *buffer, int blocks, int flags)
{
- return DVDcss_read(dev->dvdcss, buffer, blocks, flags);
+ return DVD_read(dev->libdvd, buffer, blocks, flags);
}
/**
* close the DVD device and clean up the library.
*/
-static int css_close(dvd_input_t dev)
+static int libdvd_close(dvd_input_t dev)
{
int ret;
- ret = DVDcss_close(dev->dvdcss);
+ ret = DVD_close(dev->libdvd);
if(ret < 0)
return ret;
@@ -280,8 +280,8 @@ static int file_close(dvd_input_t dev)
}
-static void *dvdcss_library = NULL;
-static int dvdcss_library_init = 0;
+static void *libdvd_library = NULL;
+static int libdvd_library_init = 0;
/**
* Free any objects allocated by dvdinput_setup.
@@ -294,28 +294,36 @@ void dvdinput_free(void)
/* linked statically, nothing to free */
return;
#else
- if(dvdcss_library) {
- dlclose(dvdcss_library);
- dvdcss_library = NULL;
+ if(libdvd_library) {
+ dlclose(libdvd_library);
+ libdvd_library = NULL;
}
- dvdcss_library_init = 0;
+ libdvd_library_init = 0;
return;
#endif
}
+#if defined(DEBUG_CSS)
+#define LIBDVDNAME "libdvdcss.so.2"
+#define LIBDVD_ "dvdcss_"
+#else
+#define LIBDVDNAME "libdvd.so.0"
+#define LIBDVD_ "libdvd_"
+#endif
+
/**
- * Setup read functions with either libdvdcss or minimal DVD access.
+ * Setup read functions with either libdvd or minimal DVD access.
*/
int dvdinput_setup(void)
{
- char **dvdcss_version = NULL;
+ char **libdvd_version = NULL;
int verbose;
/* dlopening libdvdcss */
- if(dvdcss_library_init) {
+ if(libdvd_library_init) {
/* libdvdcss is already dlopened, function ptrs set */
- if(dvdcss_library) {
+ if(libdvd_library) {
return 1; /* css available */
} else {
return 0; /* css not available */
@@ -326,59 +334,57 @@ int dvdinput_setup(void)
#ifdef HAVE_DVDCSS_DVDCSS_H
/* linking to libdvdcss */
- dvdcss_library = &dvdcss_library; /* Give it some value != NULL */
+ libdvd_library = &libdvd_library; /* Give it some value != NULL */
/* the DVDcss_* functions have been #defined at the top */
- dvdcss_version = &dvdcss_interface_2;
+ libdvd_version = &libdvd_interface_2;
#else
- dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY);
+ libdvd_library = dlopen(LIBDVDNAME, RTLD_LAZY);
- if(dvdcss_library != NULL) {
+ if(libdvd_library != NULL) {
#if defined(__OpenBSD__) && !defined(__ELF__)
#define U_S "_"
#else
#define U_S
#endif
- DVDcss_open = (dvdcss_handle (*)(const char*))
- dlsym(dvdcss_library, U_S "dvdcss_open");
- DVDcss_close = (int (*)(dvdcss_handle))
- dlsym(dvdcss_library, U_S "dvdcss_close");
- DVDcss_title = (int (*)(dvdcss_handle, int))
- dlsym(dvdcss_library, U_S "dvdcss_title");
- DVDcss_seek = (int (*)(dvdcss_handle, int, int))
- dlsym(dvdcss_library, U_S "dvdcss_seek");
- DVDcss_read = (int (*)(dvdcss_handle, void*, int, int))
- dlsym(dvdcss_library, U_S "dvdcss_read");
- DVDcss_error = (char* (*)(dvdcss_handle))
- dlsym(dvdcss_library, U_S "dvdcss_error");
+ DVD_open = (libdvd_handle (*)(const char*))
+ dlsym(libdvd_library, U_S LIBDVD_"open");
+ DVD_close = (int (*)(libdvd_handle))
+ dlsym(libdvd_library, U_S LIBDVD_"close");
+ DVD_title = (int (*)(libdvd_handle, int))
+ dlsym(libdvd_library, U_S LIBDVD_"title");
+ DVD_seek = (int (*)(libdvd_handle, int, int))
+ dlsym(libdvd_library, U_S LIBDVD_"seek");
+ DVD_read = (int (*)(libdvd_handle, void*, int, int))
+ dlsym(libdvd_library, U_S LIBDVD_"read");
+ DVD_error = (char* (*)(libdvd_handle))
+ dlsym(libdvd_library, U_S LIBDVD_"error");
- dvdcss_version = (char **)dlsym(dvdcss_library, U_S "dvdcss_interface_2");
+ libdvd_version = (char **)dlsym(libdvd_library, U_S LIBDVD_"interface_2");
- if(dlsym(dvdcss_library, U_S "dvdcss_crack")) {
+ if(dlsym(libdvd_library, U_S "dvdcss_crack")) {
if(verbose >= 0) {
fprintf(stderr,
- "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n"
- "libdvdread: You should get the latest version from "
- "http://www.videolan.org/\n" );
+ "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n");
}
- dlclose(dvdcss_library);
- dvdcss_library = NULL;
- } else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek
- || !DVDcss_read || !DVDcss_error || !dvdcss_version) {
+ dlclose(libdvd_library);
+ libdvd_library = NULL;
+ } else if(!DVD_open || !DVD_close || !DVD_title || !DVD_seek
+ || !DVD_read || !DVD_error || !libdvd_version) {
if(verbose >= 0) {
- fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, "
- "this shouldn't happen !\n");
+ fprintf(stderr, "libdvdread: Missing symbols in %s, "
+ "this shouldn't happen !\n", LIBDVDNAME);
}
- dlclose(dvdcss_library);
- dvdcss_library = NULL;
+ dlclose(libdvd_library);
+ libdvd_library = NULL;
}
}
#endif /* HAVE_DVDCSS_DVDCSS_H */
- dvdcss_library_init = 1;
+ libdvd_library_init = 1;
- if(dvdcss_library) {
+ if(libdvd_library) {
/*
char *psz_method = getenv( "DVDCSS_METHOD" );
char *psz_verbose = getenv( "DVDCSS_VERBOSE" );
@@ -386,16 +392,16 @@ int dvdinput_setup(void)
fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose);
*/
if(verbose >= 1) {
- fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n",
- *dvdcss_version);
+ fprintf(stderr, "libdvdread: Using %s version %s for DVD access\n",
+ LIBDVDNAME, *libdvd_version);
}
/* libdvdcss wrapper functions */
- dvdinput_open = css_open;
- dvdinput_close = css_close;
- dvdinput_seek = css_seek;
- dvdinput_title = css_title;
- dvdinput_read = css_read;
- dvdinput_error = css_error;
+ dvdinput_open = libdvd_open;
+ dvdinput_close = libdvd_close;
+ dvdinput_seek = libdvd_seek;
+ dvdinput_title = libdvd_title;
+ dvdinput_read = libdvd_read;
+ dvdinput_error = libdvd_error;
return 1;
} else {

17
devel/libdvdread/patches/patch-dvdread_ifo_types_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-dvdread_ifo_types_h,v 1.1 2006/02/19 18:28:55 espie Exp $
--- dvdread/ifo_types.h.orig Sun Feb 19 18:57:54 2006
+++ dvdread/ifo_types.h Sun Feb 19 19:00:02 2006
@@ -28,8 +28,12 @@
#error "Must include <inttypes.h> or <stdint.h> before any libdvdread header."
#endif
#else
-#if !defined(UINT8_MAX) || !defined(UINT16_MAX) || !defined(INT32_MAX)
+#if defined(UINT8_MAX) && defined(UINT16_MAX) && defined(INT32_MAX)
+#else
+#if defined(__OpenBSD__) && defined(__cplusplus) && defined(__BIT_TYPES_DEFINED__)
+#else
#error "Must include <inttypes.h> or <stdint.h> before any libdvdread header."
+#endif
#endif
#endif

20
devel/libdvdread/patches/patch-src_md5_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_md5_c,v 1.1 2012/05/03 06:51:07 ajacoutot Exp $
Use the config.h header to set WORDS_BIGENDIAN instead of another means of checking.
--- src/md5.c.orig Mon Apr 30 01:22:39 2012
+++ src/md5.c Mon Apr 30 01:22:56 2012
@@ -28,12 +28,7 @@
#include "md5.h"
/* #include "unlocked-io.h" */
-#ifdef _LIBC
-# include <endian.h>
-# if __BYTE_ORDER == __BIG_ENDIAN
-# define WORDS_BIGENDIAN 1
-# endif
-#endif
+#include "config.h"
#ifdef WORDS_BIGENDIAN
# define SWAP(n) \

20
devel/libdvdread/patches/patch-version_sh Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-version_sh,v 1.1 2012/05/03 06:51:07 ajacoutot Exp $
--- version.sh.orig Fri Dec 16 08:46:11 2011
+++ version.sh Fri Dec 16 09:22:36 2011
@@ -1,15 +1,6 @@
#!/bin/sh
-svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | \
- cut -d '"' -f2 2> /dev/null`
-test $svn_revision || svn_revision=UNKNOWN
-
-if test "$svn_revision" = UNKNOWN && test -n "$2"; then
- NEW_REVISION="#define VERSION \"$2\""
-else
- NEW_REVISION="#define VERSION \"SVN-r$svn_revision\""
-fi
+NEW_REVISION="#define VERSION \"$2\""
OLD_REVISION=`cat version.h 2> /dev/null`
# Update version.h only on revision changes to avoid spurious rebuilds

4
devel/libdvdread/pkg/DESCR
View File

@ -11,6 +11,6 @@ It offers DVD applications:
This allows application designers to access some of the more advanced
features of the DVD format.
libdvdread currently uses libdl to dynamically probe for libdvd at
runtime. If libdvd is found, then it will be used to decrypt the
libdvdread currently uses dlopen() to dynamically probe for libdvdcss at
runtime. If libdvdcss is found, then it will be used to decrypt the
encrypted sections of a DVD.

2
devel/libdvdread/pkg/PFRAG.shared
View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/03 14:55:18 bernd Exp $
@lib lib/libdvdread.so.${LIBdvdread_VERSION}

10
devel/libdvdread/pkg/PLIST
View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.5 2006/02/16 11:08:26 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2012/05/03 06:51:07 ajacoutot Exp $
bin/dvdread-config
include/dvdread/
include/dvdread/cmd_print.h
include/dvdread/bitreader.h
include/dvdread/dvd_reader.h
include/dvdread/dvd_udf.h
include/dvdread/ifo_print.h
include/dvdread/ifo_read.h
include/dvdread/ifo_types.h
@ -9,5 +11,5 @@ include/dvdread/nav_print.h
include/dvdread/nav_read.h
include/dvdread/nav_types.h
lib/libdvdread.a
lib/libdvdread.la
%%SHARED%%
@lib lib/libdvdread.so.${LIBdvdread_VERSION}
lib/pkgconfig/dvdread.pc