[SCM] libbluray/master: Drop patch, included upstream
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sat May 23 15:02:52 UTC 2015
The following commit has been merged in the master branch:
commit 2ff1bef1b1fc466544c76c48c978e878f6e21069
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat May 23 16:57:14 2015 +0200
Drop patch, included upstream
diff --git a/debian/patches/05_bd_open-return-NULL-if-disc-root-is-NULL.patch b/debian/patches/05_bd_open-return-NULL-if-disc-root-is-NULL.patch
deleted file mode 100644
index ef7f526..0000000
--- a/debian/patches/05_bd_open-return-NULL-if-disc-root-is-NULL.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: bd_open(): return NULL if disc root is NULL
- Fixes crash when disc files are accessed later.
-Origin: upstream,
- http://git.videolan.org/?p=libbluray.git;a=commit;h=ac97f9c02ab9b939712fae5e8798c40952624580
-Last-Update: 2015-05-13
-Bug-Debian: https://bugs.debian.org/785159
-
---- a/src/libbluray/bluray.c
-+++ b/src/libbluray/bluray.c
-@@ -1362,7 +1362,10 @@
- return NULL;
- }
-
-- bd_open_disc(bd, device_path, keyfile_path);
-+ if (!bd_open_disc(bd, device_path, keyfile_path)) {
-+ bd_close(bd);
-+ return NULL;
-+ }
-
- return bd;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 1afcbb4..dfdf08d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
02_online-image.patch
03_split-jar-build-for-arch-all.patch
04_kfreebsd-include.patch
-05_bd_open-return-NULL-if-disc-root-is-NULL.patch
--
libbluray packaging
More information about the pkg-multimedia-commits
mailing list