diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 01:29:58 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-01 01:29:58 +0000 |
| commit | 1e70919700fde382d13f28f023ed1fa08cddf49a (patch) | |
| tree | 5382104078de65add6b99ef7189c0d81ff0dff48 | |
| parent | 9524b748a27734b4cdee2d348adfd0606abdedda (diff) | |
| parent | 4c48996da5a13a135338e745157c45f351300540 (diff) | |
| download | xine-lib-1e70919700fde382d13f28f023ed1fa08cddf49a.tar.gz xine-lib-1e70919700fde382d13f28f023ed1fa08cddf49a.tar.bz2 | |
Merge from 1.1, discarding es.po changes.
--HG--
rename : misc/xine-config => misc/xine-config.in
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | misc/Makefile.am | 1 | ||||
| -rw-r--r-- | misc/xine-config.in (renamed from misc/xine-config) | 5 | ||||
| -rw-r--r-- | po/LINGUAS | 1 | ||||
| -rw-r--r-- | src/libreal/real_common.c | 4 |
7 files changed, 18 insertions, 5 deletions
@@ -56,6 +56,9 @@ xine-lib (1.1.90) (Unreleased) active and thus it's no more usable. If you were using SyncFB somehow, please use DirectFB or VIDIX instead. +xine-lib (1.1.11) unreleased + * Fix a RealPlayer codec detection bug. + xine-lib (1.1.10) 2008-01-26 * Security fixes: - Buffer overflow which allows a remote attacker to execute arbitrary diff --git a/configure.ac b/configure.ac index 95774e221..8e6dc72a9 100644 --- a/configure.ac +++ b/configure.ac @@ -988,8 +988,10 @@ makeexpand () { xinelibdir='${libdir}/xine' xinedatadir='${datadir}/xine' +pkgconfigdir='${libdir}/pkgconfig' AC_SUBST(xinelibdir) AC_SUBST(xinedatadir) +AC_SUBST(pkgconfigdir) XINE_PLUGINDIR="\${xinelibdir}/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH" XINE_FONTDIR="\${xinedatadir}/libxine$XINE_MAJOR/fonts" @@ -998,6 +1000,7 @@ XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`" XINE_REL_PLUGINDIR="`makeexpand "$XINE_REL_PLUGINDIR" | sed -e "s,^${prefix}/,,"`" XINE_REL_FONTDIR="`makeexpand "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`" XINE_REL_LOCALEDIR="`makeexpand "$XINE_LOCALEDIR" | sed -e "s,^${prefix}/,,"`" +XINE_PKGCONFIG_DIR="`makeexpand "$pkgconfigdir"`" if test "x$WIN32_SYS" = "xmingw32" -o "x$WIN32_SYS" = "xcygwin"; then dnl polish paths (MinGW runtime accepts both \ and / anyway) XINE_REL_PLUGINDIR="`echo "$XINE_REL_PLUGINDIR" | sed -e 's/\\//\\\\\\\\/g'`" @@ -1035,6 +1038,7 @@ AC_SUBST(XINE_LOCALEPATH) AC_SUBST(XINE_PLUGINDIR) AC_SUBST(XINE_FONTDIR) AC_SUBST(XINE_LOCALEDIR) +AC_SUBST(XINE_PKGCONFIG_DIR) dnl Where aclocal m4 files should be installed xine_acflags='-I ${datarootdir}/aclocal' @@ -1169,6 +1173,7 @@ misc/SlackBuild misc/build_rpms.sh misc/libxine.pc misc/relchk.sh +misc/xine-config misc/xine-lib.spec po/Makefile.in src/Makefile diff --git a/debian/changelog b/debian/changelog index 2460b1267..803c3f72f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ xine-lib-1.2 (1.2.0~hg-0) experimental; urgency=low -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100 -xine-lib (1.1.10~hg-0) unstable; urgency=low +xine-lib (1.1.10+hg-0) unstable; urgency=low [ Darren Salt ] * Hg snapshot. @@ -14,7 +14,7 @@ xine-lib (1.1.10~hg-0) unstable; urgency=low * remove gs from build-dependencies * change the maintainer field to xine-devel@lists.sourceforge.net. - -- Darren Salt <linux@youmustbejoking.demon.co.uk> Mon, 14 Jan 2008 22:57:42 +0000 + -- Darren Salt <linux@youmustbejoking.demon.co.uk> Sun, 27 Jan 2008 01:41:45 +0000 xine-lib (1.1.5~cvs-0) unstable; urgency=low diff --git a/misc/Makefile.am b/misc/Makefile.am index a6b7d2921..cd013b752 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -14,7 +14,6 @@ EXTRA_DIST = build_rpms.sh \ bin_SCRIPTS = xine-config -pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA=libxine.pc fontdir = $(pkgdatadir)/fonts diff --git a/misc/xine-config b/misc/xine-config.in index 8962c8079..1492d739b 100644 --- a/misc/xine-config +++ b/misc/xine-config.in @@ -6,6 +6,11 @@ unset prefix unset exec_prefix unset args +export PKG_CONFIG_PATH="$(cat <<'EOF' +@XINE_PKGCONFIG_DIR@ +EOF +)${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH" + usage() { cat <<EOF diff --git a/po/LINGUAS b/po/LINGUAS index 8a29b895c..87a156243 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,5 +1,6 @@ cs de +eo es eu fr diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c index 531fb780e..6cc1d8785 100644 --- a/src/libreal/real_common.c +++ b/src/libreal/real_common.c @@ -77,8 +77,8 @@ void _x_real_codecs_init(xine_t *const xine) { default_real_codecs_path[0] = 0; -#define UL64 0x05 /* /usr/{,local/}lib64 */ -#define UL 0x0A /* /usr/{,local/}lib */ +#define UL64 0x03 /* /usr/{,local/}lib64 */ +#define UL 0x0C /* /usr/{,local/}lib */ #define O 0x10 /* /opt */ #define OL64 0x20 /* /opt/lib64 */ #define OL 0x40 /* /opt/lib */ |