Skip to contentSkip to conversation

package/libtheora: Fix dynamic linking

PATCH New Bernd Kuhls 2 participants 6 messages Aug 1, 2015 – Oct 15, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 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 <[email protected]>
---
 package/libtheora/0001-link-libtheoradec.patch | 21 ++++++++++++
 package/libtheora/0002-fix-autoreconf.patch    | 46 ++++++++++++++++++++++++++
 package/libtheora/libtheora.mk                 |  1 +
 3 files changed, 68 insertions(+)
 create mode 100644 package/libtheora/0001-link-libtheoradec.patch
 create mode 100644 package/libtheora/0002-fix-autoreconf.patch
package/libtheora/0001-link-libtheoradec.patch new file +21 -0
new file mode 100644
index 0000000..c38d32b
@@ -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 <[email protected]>
+
+--- 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) \
package/libtheora/0002-fix-autoreconf.patch new file +46 -0

46 lines not on this page · raw message

package/libtheora/libtheora.mk +1 -0
index 480af75..11f2c3e 100644
@@ -8,6 +8,7 @@ LIBTHEORA_VERSION = 1.1.1
 LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.xz
 LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora
 LIBTHEORA_INSTALL_STAGING = YES
+LIBTHEORA_AUTORECONF = YES
 LIBTHEORA_LICENSE = BSD-3c
 LIBTHEORA_LICENSE_FILES = COPYING LICENSE
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 2/2 package/ffmpeg: Add optional dependencies

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/ffmpeg/ffmpeg.mk | 60 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 4 deletions(-)
package/ffmpeg/ffmpeg.mk +56 -4
index 54c9f52..5fc2d57 100644
@@ -51,13 +51,9 @@ FFMPEG_CONF_OPTS = \
 	--disable-libdc1394 \
 	--disable-libfaac \
 	--disable-libgsm \
-	--disable-libmp3lame \
 	--disable-libnut \
 	--disable-libopenjpeg \
-	--disable-librtmp \
 	--disable-libschroedinger \
-	--disable-libspeex \
-	--disable-libtheora \
 	--disable-libvo-aacenc \
 	--disable-libvo-amrwbenc \
 	--disable-symver \

@@ -234,6 +230,62 @@ else
 FFMPEG_CONF_OPTS += --disable-libvpx
 endif
 
+ifeq ($(BR2_PACKAGE_LIBASS),y)
+FFMPEG_CONF_OPTS += --enable-libass
+FFMPEG_DEPENDENCIES += libass
+else
+FFMPEG_CONF_OPTS += --disable-libass
+endif
+
+ifeq ($(BR2_PACKAGE_LIBBLURAY),y)
+FFMPEG_CONF_OPTS += --enable-libbluray
+FFMPEG_DEPENDENCIES += libbluray
+else
+FFMPEG_CONF_OPTS += --disable-libbluray
+endif
+
+ifeq ($(BR2_PACKAGE_RTMPDUMP),y)
+FFMPEG_CONF_OPTS += --enable-librtmp
+FFMPEG_DEPENDENCIES += rtmpdump
+else
+FFMPEG_CONF_OPTS += --disable-librtmp
+endif
+
+ifeq ($(BR2_PACKAGE_LAME),y)
+FFMPEG_CONF_OPTS += --enable-libmp3lame
+FFMPEG_DEPENDENCIES += lame
+else
+FFMPEG_CONF_OPTS += --disable-libmp3lame
+endif
+
+ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
+FFMPEG_CONF_OPTS += --enable-libmodplug
+FFMPEG_DEPENDENCIES += libmodplug
+else
+FFMPEG_CONF_OPTS += --disable-libmodplug
+endif
+
+ifeq ($(BR2_PACKAGE_SPEEX),y)
+FFMPEG_CONF_OPTS += --enable-libspeex
+FFMPEG_DEPENDENCIES += speex
+else
+FFMPEG_CONF_OPTS += --disable-libspeex
+endif
+
+ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
+FFMPEG_CONF_OPTS += --enable-libtheora
+FFMPEG_DEPENDENCIES += libtheora
+else
+FFMPEG_CONF_OPTS += --disable-libtheora
+endif
+
+ifeq ($(BR2_PACKAGE_WAVPACK),y)
+FFMPEG_CONF_OPTS += --enable-libwavpack
+FFMPEG_DEPENDENCIES += wavpack
+else
+FFMPEG_CONF_OPTS += --disable-libwavpack
+endif
+
 # ffmpeg freetype support require fenv.h which is only
 # available/working on glibc.
 # The microblaze variant doesn't provide the needed exceptions
Signature · 1 line
2.1.4
Applied
#2 lore raw

PATCH 2/2 package/ffmpeg: Add optional dependencies

Dear Bernd Kuhls,

Quoted 4 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/ffmpeg/ffmpeg.mk | 60 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 4 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 2/2 package/ffmpeg: Add optional dependencies

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 4 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/ffmpeg/ffmpeg.mk | 60 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 4 deletions(-)

This seems to break the build:

http://autobuild.buildroot.org/results/ae0/ae0c4bab7975ed2ad77a9f9fd6a300d1327d56b9/build-end.log

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#4 lore raw

PATCH 2/2 package/ffmpeg: Add optional dependencies

Am Thu, 15 Oct 2015 16:11:09 +0200 schrieb Thomas Petazzoni:

Quoted 11 lines

Dear Bernd Kuhls,

Quoted 4 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/ffmpeg/ffmpeg.mk | 60 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 4 deletions(-)

This seems to break the build:

http://autobuild.buildroot.org/results/ae0/ae0c4bab7975ed2ad77a9f9fd6a300d1327d56b9/build-end.log

Hi Thomas,

should be fixed by http://patchwork.ozlabs.org/patch/530860/

Regards, Bernd

Applied
#5 lore raw

PATCH 1/2 package/libtheora: Fix dynamic linking

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 6 lines · Bernd Kuhls

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.

Quoted 8 lines
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/libtheora/0001-link-libtheoradec.patch | 21 ++++++++++++
 package/libtheora/0002-fix-autoreconf.patch    | 46 ++++++++++++++++++++++++++
 package/libtheora/libtheora.mk                 |  1 +
 3 files changed, 68 insertions(+)
 create mode 100644 package/libtheora/0001-link-libtheoradec.patch
 create mode 100644 package/libtheora/0002-fix-autoreconf.patch

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com