[SCM] libbluray/master: Drop soname-bump.patch, the bump was done upstream now
ricotz-guest at users.alioth.debian.org
ricotz-guest at users.alioth.debian.org
Sat Dec 10 15:45:21 UTC 2011
The following commit has been merged in the master branch:
commit e727488648a2213d54b8212da8bc886e5878527c
Author: Rico Tzschichholz <ricotz at t-online.de>
Date: Sat Dec 10 16:28:48 2011 +0100
Drop soname-bump.patch, the bump was done upstream now
diff --git a/debian/patches/autoreconf.patch b/debian/patches/autoreconf.patch
deleted file mode 100644
index d99d717..0000000
--- a/debian/patches/autoreconf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Patch used to set changes to build system.
-Origin: Debian
-Forwarded: non-needed
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -339,10 +339,10 @@
- top_srcdir = @top_srcdir@
-
- # library version info
--# NOTE: this is not the same as the library's release number
--LIB_CURRENT = 0
--LIB_REVISION = 0
--LIB_AGE = 0
-+# NOTE: soname version is retrieved from bluray.h.
-+LIB_CURRENT = $(shell grep -e 'define LIBBLURAY_VERSION_MAJOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/')
-+LIB_REVISION = $(shell grep -e 'define LIBBLURAY_VERSION_MINOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/')
-+LIB_AGE = $(shell grep -e 'define LIBBLURAY_VERSION_MICRO' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/')
- LIB_VERSION_INFO = "$(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE)"
- SUBDIRS = . examples
- SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ecaa44b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-soname-bump.patch
-autoreconf.patch
diff --git a/debian/patches/soname-bump.patch b/debian/patches/soname-bump.patch
deleted file mode 100644
index dc7b7ec..0000000
--- a/debian/patches/soname-bump.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Patch that will correctly set soname through bluray.h. Much of
- these changes was taken from code used to set library soname for libav
- libraries.
-Author: Andres Mejia <amejia at debian.org>
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,8 +1,8 @@
- # library version info
--# NOTE: this is not the same as the library's release number
--LIB_CURRENT=0
--LIB_REVISION=0
--LIB_AGE=0
-+# NOTE: soname version is retrieved from bluray.h.
-+LIB_CURRENT = $(shell grep -e 'define LIBBLURAY_VERSION_MAJOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/')
-+LIB_REVISION = $(shell grep -e 'define LIBBLURAY_VERSION_MINOR' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/')
-+LIB_AGE = $(shell grep -e 'define LIBBLURAY_VERSION_MICRO' libbluray/bluray.h | sed -e 's/[^0-9]*\([0-9]\+\)/\1/')
- LIB_VERSION_INFO="$(LIB_CURRENT):$(LIB_REVISION):$(LIB_AGE)"
-
- SUBDIRS= . examples
---- a/src/libbluray/bluray.h
-+++ b/src/libbluray/bluray.h
-@@ -31,6 +31,29 @@
- * external API header
- */
-
-+/* NOTE: Formatting of these is important.
-+ * Also, this version is not the same as the library's release version.
-+ */
-+#define LIBBLURAY_VERSION_MAJOR 1
-+#define LIBBLURAY_VERSION_MINOR 0
-+#define LIBBLURAY_VERSION_MICRO 0
-+
-+#define LB_STRINGIFY(s) LB_TOSTRING(s)
-+#define LB_TOSTRING(s) #s
-+#define LB_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-+#define LB_VERSION_DOT(a, b, c) a ##.## b ##.## c
-+#define LB_VERSION(a, b, c) LB_VERSION_DOT(a, b, c)
-+
-+#define LIBBLURAY_VERSION_INT LB_VERSION_INT(LIBBLURAY_VERSION_MAJOR, \
-+ LIBBLURAY_VERSION_MINOR, \
-+ LIBBLURAY_VERSION_MICRO)
-+#define LIBBLURAY_VERSION LB_VERSION(LIBBLURAY_VERSION_MAJOR, \
-+ LIBBLURAY_VERSION_MINOR, \
-+ LIBBLURAY_VERSION_MICRO)
-+#define LIBBLURAY_BUILD LIBBLURAY_VERSION_INT
-+
-+#define LIBBLURAY_IDENT "Lbluray" LB_STRINGIFY(LIBBLURAY_VERSION)
-+
- #include <stdint.h>
-
- #define TITLES_ALL 0 /**< all titles. */
--
libbluray packaging
More information about the pkg-multimedia-commits
mailing list