[SCM] libbluray/master: Use different mechanism to set soname.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a9ea090bff5ee5c41eed30aa3221ca56a4b8ae6f
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Oct 1 17:17:59 2011 -0400

    Use different mechanism to set soname.

diff --git a/debian/patches/soname-bump.patch b/debian/patches/soname-bump.patch
index bcb1cb2..dc7b7ec 100644
--- a/debian/patches/soname-bump.patch
+++ b/debian/patches/soname-bump.patch
@@ -1,13 +1,52 @@
-Description: Patch that does basic spell check.
-Origin: Debian
+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,6 +1,6 @@
+@@ -1,8 +1,8 @@
  # library version info
- # NOTE: this is not the same as the library's release number
+-# NOTE: this is not the same as the library's release number
 -LIB_CURRENT=0
-+LIB_CURRENT=1
- LIB_REVISION=0
- LIB_AGE=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