libraries/libdvdcss: Updated for version 1.4.3.
This commit is contained in:
Robby Workman
parent
691ae7a8a9
commit
61cf18c6c6
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Slackware build script for libdvdcss
|
||||
|
||||
# Copyright 2006-2016 Robby Workman, Tuscaloosa, Alabama, USA
|
||||
# Copyright 2006-2021 Robby Workman, Tuscaloosa, Alabama, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=libdvdcss
|
||||
VERSION=${VERSION:-1.4.0}
|
||||
BUILD=${BUILD:-2}
|
||||
VERSION=${VERSION:-1.4.3}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
|
@ -69,12 +69,6 @@ find -L . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \;
|
||||
|
||||
patch -p1 < $CWD/patches/0001-Fix-using-DVDCSS_CACHE-environment-variable.patch
|
||||
patch -p1 < $CWD/patches/0002-Improve-error-reporting-when-cache-directory-creatio.patch
|
||||
patch -p1 < $CWD/patches/0003-Check-for-empty-strings.patch
|
||||
patch -p1 < $CWD/patches/0004-Fix-check-for-empty-home-dir.patch
|
||||
patch -p1 < $CWD/patches/0005-Don-t-close-any-handle-if-callback-functions-are-use.patch
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
PRGNAM="libdvdcss"
|
||||
VERSION="1.4.0"
|
||||
VERSION="1.4.3"
|
||||
HOMEPAGE="http://www.videolan.org/developers/libdvdcss.html"
|
||||
DOWNLOAD="http://download.videolan.org/pub/libdvdcss/1.4.0/libdvdcss-1.4.0.tar.bz2"
|
||||
MD5SUM="2edba36e6af3f0223c4f0454cdf3d159"
|
||||
DOWNLOAD="http://download.videolan.org/pub/libdvdcss/1.4.3/libdvdcss-1.4.3.tar.bz2"
|
||||
MD5SUM="e98239a88af9b2204f9b9d987c2bc71a"
|
||||
DOWNLOAD_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES=""
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
From 98c66a5b51db1e7a3a056deaafcb9a76d09afbeb Mon Sep 17 00:00:00 2001
|
||||
From: Petri Hintukainen <phintuka@gmail.com>
|
||||
Date: Fri, 11 Mar 2016 12:00:05 +0200
|
||||
Subject: [PATCH 1/5] Fix using DVDCSS_CACHE environment variable
|
||||
|
||||
---
|
||||
src/libdvdcss.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
|
||||
index 2f78b78..7d86a08 100644
|
||||
--- a/src/libdvdcss.c
|
||||
+++ b/src/libdvdcss.c
|
||||
@@ -274,6 +274,11 @@ static int set_cache_directory( dvdcss_t dvdcss )
|
||||
}
|
||||
#endif /* ! defined( _WIN32 ) */
|
||||
}
|
||||
+ else
|
||||
+ {
|
||||
+ strncpy( dvdcss->psz_cachefile, psz_cache, PATH_MAX );
|
||||
+ dvdcss->psz_cachefile[PATH_MAX - 1] = '\0';
|
||||
+ }
|
||||
|
||||
/* Check that there is enough space for the cache directory path and the
|
||||
* block filename. The +1s are path separators. */
|
||||
--
|
||||
2.10.0
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 22cb2d442fecf4dd8122347309dbf27ad79e5559 Mon Sep 17 00:00:00 2001
|
||||
From: Petri Hintukainen <phintuka@gmail.com>
|
||||
Date: Fri, 11 Mar 2016 12:04:34 +0200
|
||||
Subject: [PATCH 2/5] Improve error reporting when cache directory creation
|
||||
fails
|
||||
|
||||
---
|
||||
src/libdvdcss.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
|
||||
index 7d86a08..408ec2f 100644
|
||||
--- a/src/libdvdcss.c
|
||||
+++ b/src/libdvdcss.c
|
||||
@@ -305,7 +305,7 @@ static int init_cache_dir( dvdcss_t dvdcss )
|
||||
i_ret = mkdir( dvdcss->psz_cachefile, 0755 );
|
||||
if( i_ret < 0 && errno != EEXIST )
|
||||
{
|
||||
- print_error( dvdcss, "failed creating cache directory" );
|
||||
+ print_error( dvdcss, "failed creating cache directory '%s'", dvdcss->psz_cachefile );
|
||||
dvdcss->psz_cachefile[0] = '\0';
|
||||
return -1;
|
||||
}
|
||||
--
|
||||
2.10.0
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
From 100ac1a3762915042ee65b1bf370399966f61be5 Mon Sep 17 00:00:00 2001
|
||||
From: Petri Hintukainen <phintuka@gmail.com>
|
||||
Date: Fri, 11 Mar 2016 12:07:03 +0200
|
||||
Subject: [PATCH 3/5] Check for empty strings
|
||||
|
||||
---
|
||||
src/libdvdcss.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
|
||||
index 408ec2f..ac90030 100644
|
||||
--- a/src/libdvdcss.c
|
||||
+++ b/src/libdvdcss.c
|
||||
@@ -234,7 +234,7 @@ static int set_cache_directory( dvdcss_t dvdcss )
|
||||
|
||||
/* Try looking in password file for home dir. */
|
||||
p_pwd = getpwuid(getuid());
|
||||
- if( p_pwd )
|
||||
+ if( p_pwd && p_pwd[ 0 ] )
|
||||
{
|
||||
psz_home = p_pwd->pw_dir;
|
||||
}
|
||||
@@ -248,7 +248,7 @@ static int set_cache_directory( dvdcss_t dvdcss )
|
||||
}
|
||||
|
||||
/* Cache our keys in ${HOME}/.dvdcss/ */
|
||||
- if( psz_home )
|
||||
+ if( psz_home && psz_home[ 0 ] )
|
||||
{
|
||||
int home_pos = 0;
|
||||
|
||||
--
|
||||
2.10.0
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 5fd2b38c343a94407863d9fa0820aa251c3d354c Mon Sep 17 00:00:00 2001
|
||||
From: Petri Hintukainen <phintuka@gmail.com>
|
||||
Date: Sun, 13 Mar 2016 12:27:02 +0200
|
||||
Subject: [PATCH 4/5] Fix check for empty home dir
|
||||
|
||||
---
|
||||
src/libdvdcss.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
|
||||
index ac90030..6e5d6e1 100644
|
||||
--- a/src/libdvdcss.c
|
||||
+++ b/src/libdvdcss.c
|
||||
@@ -234,7 +234,7 @@ static int set_cache_directory( dvdcss_t dvdcss )
|
||||
|
||||
/* Try looking in password file for home dir. */
|
||||
p_pwd = getpwuid(getuid());
|
||||
- if( p_pwd && p_pwd[ 0 ] )
|
||||
+ if( p_pwd && p_pwd->pw_dir && p_pwd->pw_dir[ 0 ] )
|
||||
{
|
||||
psz_home = p_pwd->pw_dir;
|
||||
}
|
||||
--
|
||||
2.10.0
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 5bec036cfee3950d002f3c46c17bbd4e375d5bd6 Mon Sep 17 00:00:00 2001
|
||||
From: Hannes Domani <ssbssa@yahoo.de>
|
||||
Date: Thu, 25 Feb 2016 21:03:29 +0100
|
||||
Subject: [PATCH 5/5] Don't close any handle if callback functions are used
|
||||
|
||||
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
|
||||
---
|
||||
src/device.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/device.c b/src/device.c
|
||||
index af735e0..baa4bc5 100644
|
||||
--- a/src/device.c
|
||||
+++ b/src/device.c
|
||||
@@ -406,6 +406,11 @@ int dvdcss_open_device ( dvdcss_t dvdcss )
|
||||
|
||||
int dvdcss_close_device ( dvdcss_t dvdcss )
|
||||
{
|
||||
+ if( dvdcss->p_stream )
|
||||
+ {
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
#if defined( _WIN32 )
|
||||
/* Free readv temporary buffer */
|
||||
free( dvdcss->p_readv_buffer );
|
||||
--
|
||||
2.10.0
|
||||
|
||||
Loading…
Reference in New Issue