mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 14:46:31 +00:00
package/libtheora: Fix dynamic linking
libtheoraenc.so needs to be linked to libtheoradec.so in order to avoid symbol 'th_comment_query_count': can't resolve symbol in lib '/usr/lib/libtheoraenc.so.1' when starting Freeswitch. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
1688bef4c8
commit
72f8028633
21
package/libtheora/0001-link-libtheoradec.patch
Normal file
21
package/libtheora/0001-link-libtheoradec.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
libtheoraenc.so needs to be linked to libtheoradec.so in order to avoid
|
||||||
|
|
||||||
|
symbol 'th_comment_query_count': can't resolve symbol in lib '/usr/lib/libtheoraenc.so.1'
|
||||||
|
|
||||||
|
when starting Freeswitch.
|
||||||
|
|
||||||
|
Patch downloaded from
|
||||||
|
http://www.sisyphus.ru/en/srpm/Sisyphus/libtheora/patches/0
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
--- libtheora/lib/Makefile.am
|
||||||
|
+++ libtheora/lib/Makefile.am
|
||||||
|
@@ -153,6 +153,7 @@ libtheoraenc_la_SOURCES = \
|
||||||
|
libtheoraenc_la_LDFLAGS = \
|
||||||
|
-version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \
|
||||||
|
@THEORAENC_LDFLAGS@ $(OGG_LIBS)
|
||||||
|
+libtheoraenc_la_LIBADD = libtheoradec.la
|
||||||
|
|
||||||
|
libtheora_la_SOURCES = \
|
||||||
|
$(decoder_sources) \
|
46
package/libtheora/0002-fix-autoreconf.patch
Normal file
46
package/libtheora/0002-fix-autoreconf.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
Fix broken autoreconf
|
||||||
|
|
||||||
|
Downloaded from upstream git
|
||||||
|
https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
|
||||||
|
From: Tim Terriberry <tterribe@xiph.org>
|
||||||
|
Date: Fri, 20 May 2011 20:41:50 +0000 (+0000)
|
||||||
|
Subject: Make autoreconf -i -f work.
|
||||||
|
X-Git-Url: https://git.xiph.org/?p=theora.git;a=commitdiff_plain;h=28cc6dbd9b2a141df94f60993256a5fca368fa54
|
||||||
|
|
||||||
|
Make autoreconf -i -f work.
|
||||||
|
|
||||||
|
Patch from David Schleef.
|
||||||
|
|
||||||
|
svn path=/trunk/theora/; revision=17990
|
||||||
|
---
|
||||||
|
|
||||||
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
|
index 89fd753..1783857 100644
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -4,6 +4,8 @@
|
||||||
|
#AUTOMAKE_OPTIONS = foreign 1.7 dist-zip dist-bzip2
|
||||||
|
AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
|
||||||
|
|
||||||
|
+ACLOCAL_AMFLAGS=-I m4
|
||||||
|
+
|
||||||
|
if THEORA_ENABLE_EXAMPLES
|
||||||
|
EXAMPLES_DIR = examples
|
||||||
|
else
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 1cbec1a..456b603 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -68,7 +68,7 @@ AC_LIBTOOL_WIN32_DLL
|
||||||
|
AM_PROG_LIBTOOL
|
||||||
|
|
||||||
|
dnl Add parameters for aclocal
|
||||||
|
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
|
||||||
|
+AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
||||||
|
dnl Check for doxygen
|
||||||
|
AC_ARG_ENABLE([doc],
|
@ -8,6 +8,8 @@ LIBTHEORA_VERSION = 1.1.1
|
|||||||
LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.xz
|
LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.xz
|
||||||
LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora
|
LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora
|
||||||
LIBTHEORA_INSTALL_STAGING = YES
|
LIBTHEORA_INSTALL_STAGING = YES
|
||||||
|
# We're patching Makefile.am
|
||||||
|
LIBTHEORA_AUTORECONF = YES
|
||||||
LIBTHEORA_LICENSE = BSD-3c
|
LIBTHEORA_LICENSE = BSD-3c
|
||||||
LIBTHEORA_LICENSE_FILES = COPYING LICENSE
|
LIBTHEORA_LICENSE_FILES = COPYING LICENSE
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user