diff options
| -rw-r--r-- | multimedia/lsdvd/1000-log-to-stderr.patch | 30 | ||||
| -rw-r--r-- | multimedia/lsdvd/lsdvd.SlackBuild | 5 | ||||
| -rw-r--r-- | multimedia/lsdvd/lsdvd.info | 6 |
3 files changed, 5 insertions, 36 deletions
diff --git a/multimedia/lsdvd/1000-log-to-stderr.patch b/multimedia/lsdvd/1000-log-to-stderr.patch deleted file mode 100644 index f88890e0eb..0000000000 --- a/multimedia/lsdvd/1000-log-to-stderr.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Adjust use of libdvdread to log to stderr not stdout, - to avoid generating invalid json, xml, etc when not supporting encrypted DVD. -Author: Petter Reinholdtsen <pere@hungry.com> -Origin: commit:ceb584ef8e8c84e77b01bc2aab5d9cb912f2837e -Forwarded: not-needed -Last-Update: 2024-01-02 ---- ---- a/lsdvd.c -+++ b/lsdvd.c -@@ -424,7 +424,19 @@ int main(int argc, char *argv[]) - return 1; - } - -- dvd = DVDOpen(dvd_device); -+ /* Replacement logger to send output to stderr, ensuring -+ stdout is always understandable as xml, json, perl, python, -+ etc. Without this, the 'Encrypted DVD support unavailable' -+ message can show up in the generated files. */ -+ void dvdlogger(void *, dvd_logger_level_t, -+ const char *fmt, va_list list) -+ { -+ fprintf(stderr, "libdvdread: "); -+ vfprintf(stderr, fmt, list); -+ fprintf(stderr, "\n"); -+ } -+ dvd_logger_cb logcb = { dvdlogger }; -+ dvd = DVDOpen2(NULL, &logcb, dvd_device); - if( !dvd ) { - fprintf( stderr, "Can't open disc %s!\n", dvd_device); - return 2; diff --git a/multimedia/lsdvd/lsdvd.SlackBuild b/multimedia/lsdvd/lsdvd.SlackBuild index d740b70bf2..e52ecfcd7b 100644 --- a/multimedia/lsdvd/lsdvd.SlackBuild +++ b/multimedia/lsdvd/lsdvd.SlackBuild @@ -6,6 +6,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20250618 bkw: update for 0.20. # 20250125 bkw: update for 0.19. # I have no idea where Debian got the 0.19 sources (they list the SF # project as homepage, and it only goes to 0.17), but the fixes in 0.19 @@ -16,7 +17,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lsdvd -VERSION=${VERSION:-0.19} +VERSION=${VERSION:-0.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -64,8 +65,6 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + -patch -p1 < $CWD/1000-log-to-stderr.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/lsdvd/lsdvd.info b/multimedia/lsdvd/lsdvd.info index 222e9c2382..c5d7c2a221 100644 --- a/multimedia/lsdvd/lsdvd.info +++ b/multimedia/lsdvd/lsdvd.info @@ -1,8 +1,8 @@ PRGNAM="lsdvd" -VERSION="0.19" +VERSION="0.20" HOMEPAGE="https://sourceforge.net/projects/lsdvd/" -DOWNLOAD="http://deb.debian.org/debian/pool/main/l/lsdvd/lsdvd_0.19.orig.tar.gz" -MD5SUM="2812e7c2924d27fe24b22cd3e1093b87" +DOWNLOAD="http://deb.debian.org/debian/pool/main/l/lsdvd/lsdvd_0.20.orig.tar.gz" +MD5SUM="9a7bf8f9eeea8d857c9fd3f09ab473dd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |