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

Update to libdvdcss 1.2.13.

Browse Source 
ok sthen@
This commit is contained in:
brad 2013-03-23 23:28:14 +00:00
parent a5bce354c4
commit 849757f9d9
8 changed files with 51 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
converters/libdvdcss/Makefile
View File

@ -1,12 +1,9 @@
# $OpenBSD: Makefile,v 1.22 2013/03/21 08:45:13 ajacoutot Exp $
SHARED_ONLY= Yes
# $OpenBSD: Makefile,v 1.23 2013/03/23 23:28:14 brad Exp $
COMMENT= descramble scrambled DVDs
VER= 1.2.12
VER= 1.2.13
DISTNAME= libdvdcss-${VER}
REVISION= 0
CATEGORIES= converters
MASTER_SITES= http://download.videolan.org/pub/libdvdcss/${VER}/
EXTRACT_SUFX= .tar.bz2
@ -20,9 +17,7 @@ PERMIT_PACKAGE_CDROM= Free speech issue
PERMIT_PACKAGE_FTP= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.68
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/.auto
CONFIGURE_ENV= ac_cv_path_DOXYGEN=no \
ac_cv_path_LATEX=no
AUTOCONF_VERSION= 2.69
CONFIGURE_ARGS= --disable-doc
.include <bsd.port.mk>

7
converters/libdvdcss/distinfo
View File

@ -1,5 +1,2 @@
MD5 (libdvdcss-1.2.12.tar.bz2) = Ihihk5AOMgOqENwkzfVCdQ==
RMD160 (libdvdcss-1.2.12.tar.bz2) = bLlcTuPT8oF8xroQIQd2ZItofpE=
SHA1 (libdvdcss-1.2.12.tar.bz2) = 8JdzdPEvrbvrReH/STrcJZJHuwk=
SHA256 (libdvdcss-1.2.12.tar.bz2) = ckZTldSU9gmxgMqyP5Z5rPYIP7ghvYSXmo5w97eV210=
SIZE (libdvdcss-1.2.12.tar.bz2) = 331764
SHA256 (libdvdcss-1.2.13.tar.bz2) = hPG7ps/vHfh/d0/OrvyOc8TNoy6PZwCyJK0Ky1URuiw=
SIZE (libdvdcss-1.2.13.tar.bz2) = 338588

12
converters/libdvdcss/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2013/03/23 23:28:14 brad Exp $
--- Makefile.in.orig Sun Mar 10 22:39:43 2013
+++ Makefile.in Sun Mar 10 22:40:25 2013
@@ -53,7 +53,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
EXTRA_PROGRAMS = csstest$(EXEEXT) dvd_region$(EXEEXT)
-@SYS_MSVC_FALSE@am__append_1 = = -no-undefined
+@SYS_MSVC_FALSE@am__append_1 = -no-undefined
subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
$(pkginclude_HEADERS) $(srcdir)/Makefile.am \

51
converters/libdvdcss/patches/patch-configure_ac
View File

@ -1,34 +1,21 @@
$OpenBSD: patch-configure_ac,v 1.2 2013/01/08 23:55:14 brad Exp $
--- configure.ac.orig Sun Mar 11 19:07:47 2012
+++ configure.ac Wed Oct 3 03:11:03 2012
@@ -1,4 +1,4 @@
-AC_INIT(src/libdvdcss.c)
+AC_INIT(libdvdcss, 1.2.12)
$OpenBSD: patch-configure_ac,v 1.3 2013/03/23 23:28:14 brad Exp $
--- configure.ac.orig Wed Feb 27 05:05:35 2013
+++ configure.ac Sun Mar 10 22:32:05 2013
@@ -222,12 +222,14 @@ CC_FLAG_VISIBILITY([
AM_CONDITIONAL(SYS_MSVC, test "${SYS_MSVC}" = "1")
AC_PREREQ(2.50)
AC_CONFIG_AUX_DIR(.auto)
@@ -180,6 +180,24 @@ AC_CACHE_CHECK([if \$CC accepts -Wsign-compare],
AC_TRY_COMPILE([],,ac_cv_c_Wsign_compare=yes, ac_cv_c_Wsign_compare=no)])
if test "${ac_cv_c_Wsign_compare}" != "no"; then
CFLAGS_save="-Wsign-compare ${CFLAGS_save}"
+fi
+
+CFLAGS="${CFLAGS_save}"
+
+dnl
+dnl Check if the compiler supports ELF visibility
+dnl
+CFLAGS_save="$CFLAGS"
+
+AC_CACHE_CHECK([if \$CC supports ELF visibility],
+ [ac_cv_c_visibility],
+ [CFLAGS="-fvisibility=hidden ${CFLAGS_save}"
+ AC_TRY_COMPILE([],
+ [__attribute__((visibility("default"))) extern int visible],
+ ac_cv_c_visibility=yes, ac_cv_c_visibility=no)])
+if test "${ac_cv_c_visibility}" != "no"; then
+ CFLAGS_save="-fvisibility=hidden ${CFLAGS_save}";
+ AC_DEFINE(HAVE_VISIBILITY, 1, Support ELF visibility.)
fi
AC_ARG_ENABLE([doc],
- AS_HELP_STRING([--disable-apidoc], [Disable building (with Doxygen) and intalling API documentation @<:@default=auto@:@>]))
+ AS_HELP_STRING([--disable-doc], [Disable building (with Doxygen) and intalling API documentation @<:@default=auto@:@>]))
CFLAGS="${CFLAGS_save}"
-AC_PATH_PROG([DOXYGEN], [doxygen])
+AS_IF([test "x$enable_doc" != "xno"], [
+ AC_PATH_PROG([DOXYGEN], [doxygen])
+])
AS_IF([test "x$DOXYGEN" = "x"], [
- AS_IF([test "x$enable_apidoc" = "xyes"], [
+ AS_IF([test "x$enable_doc" = "xyes"], [
AC_MSG_ERROR([You need Doxygen to build API documentation])
])
])

12
converters/libdvdcss/patches/patch-doc_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-doc_Makefile_in,v 1.2 2012/05/03 06:50:09 ajacoutot Exp $
--- doc/Makefile.in.orig Sun Mar 11 19:09:48 2012
+++ doc/Makefile.in Mon Mar 12 05:55:37 2012
@@ -364,7 +364,7 @@ all: stamp-doxygen stamp-latex
doxygen.cfg: $(srcdir)/doxygen.cfg.in
-rm -f $@
- sed 's|@SRCDIR@|$(srcdir)|g; s|@TOP_SRCDIR@|$(top_srcdir)|g' $< > $@
+ sed 's|@SRCDIR@|$(srcdir)|g; s|@TOP_SRCDIR@|$(top_srcdir)|g' $(srcdir)/doxygen.cfg.in > $@
stamp-doxygen: doxygen.cfg
@DOXYGEN_TRUE@ doxygen doxygen.cfg

14
converters/libdvdcss/patches/patch-src_css_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_css_c,v 1.2 2012/05/03 06:50:09 ajacoutot Exp $
--- src/css.c.orig Mon Nov 14 05:00:53 2011
+++ src/css.c Mon Dec 12 05:39:54 2011
@@ -218,10 +218,13 @@ int _dvdcss_title ( dvdcss_t dvdcss, int i_block )
$OpenBSD: patch-src_css_c,v 1.3 2013/03/23 23:28:14 brad Exp $
--- src/css.c.orig Tue Feb 26 03:08:35 2013
+++ src/css.c Sun Mar 10 22:29:29 2013
@@ -219,10 +219,13 @@ int _dvdcss_title ( dvdcss_t dvdcss, int i_block )
{
char psz_key[KEY_SIZE * 3];
unsigned int k0, k1, k2, k3, k4;
@ -17,7 +17,7 @@ $OpenBSD: patch-src_css_c,v 1.2 2012/05/03 06:50:09 ajacoutot Exp $
&& sscanf( psz_key, "%x:%x:%x:%x:%x",
&k0, &k1, &k2, &k3, &k4 ) == 5 )
{
@@ -235,9 +238,12 @@ int _dvdcss_title ( dvdcss_t dvdcss, int i_block )
@@ -236,9 +239,12 @@ int _dvdcss_title ( dvdcss_t dvdcss, int i_block )
/* Don't try to save it again */
b_cache = 0;
i_ret = 1;
@ -32,10 +32,10 @@ $OpenBSD: patch-src_css_c,v 1.2 2012/05/03 06:50:09 ajacoutot Exp $
}
}
@@ -249,6 +255,15 @@ int _dvdcss_title ( dvdcss_t dvdcss, int i_block )
@@ -250,6 +256,15 @@ int _dvdcss_title ( dvdcss_t dvdcss, int i_block )
if( i_ret < 0 )
{
print_error( dvdcss, "fatal error in vts css key" );
print_error( dvdcss, "fatal error in VTS CSS key" );
+ i_fd = open( dvdcss->psz_cachefile, O_RDWR|O_CREAT, 0644 );
+ if( i_fd >= 0 )
+ {

12
converters/libdvdcss/patches/patch-src_dvdcss_dvdcss_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_dvdcss_dvdcss_h,v 1.1 2013/01/08 23:55:14 brad Exp $
--- src/dvdcss/dvdcss.h.orig Wed Oct 3 03:11:33 2012
+++ src/dvdcss/dvdcss.h Wed Oct 3 03:12:21 2012
@@ -60,6 +60,8 @@ typedef struct dvdcss_s* dvdcss_t;
#define LIBDVDCSS_EXPORT __declspec(dllexport) extern
#elif defined(LIBDVDCSS_IMPORTS)
#define LIBDVDCSS_EXPORT __declspec(dllimport) extern
+#elif defined(HAVE_VISIBILITY)
+#define LIBDVDCSS_EXPORT __attribute__((visibility("default"))) extern
#else
#define LIBDVDCSS_EXPORT extern
#endif

8
converters/libdvdcss/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2012/05/03 06:50:09 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.9 2013/03/23 23:28:15 brad Exp $
include/dvdcss/
include/dvdcss/dvdcss.h
lib/libdvdcss.a
@ -6,3 +6,9 @@ lib/libdvdcss.la
@lib lib/libdvdcss.so.${LIBdvdcss_VERSION}
lib/pkgconfig/
lib/pkgconfig/libdvdcss.pc
share/doc/libdvdcss/
share/doc/libdvdcss/AUTHORS
share/doc/libdvdcss/COPYING
share/doc/libdvdcss/ChangeLog
share/doc/libdvdcss/NEWS
share/doc/libdvdcss/README