Skip to contentSkip to conversation

vlc: new package

PATCH New spdawson at gmail.com 2 participants 2 messages Jan 7, 2014 – Jan 12, 2014

lore
Share & tools
lore

spdawson at gmail.com

author
#0 lore raw

PATCH v3 1/1 vlc: new package

From: Simon Dawson <[email protected]>

Signed-off-by Simon Dawson <[email protected]>

---
v3: As suggested by Baruch Siach, vlc builds with a uClibc snapshot toolchain
v2: Fixed some issues spotted by Thomas Petazzoni

 package/Config.in                         |   1 +
 package/vlc/Config.in                     |  15 ++
 package/vlc/vlc-0001-fix-link-error.patch |  28 ++++
 package/vlc/vlc.mk                        | 237 ++++++++++++++++++++++++++++++
 4 files changed, 281 insertions(+)
 create mode 100644 package/vlc/Config.in
 create mode 100644 package/vlc/vlc-0001-fix-link-error.patch
 create mode 100644 package/vlc/vlc.mk
package/Config.in +1 -0
index e502cde..02097ff 100644
@@ -23,6 +23,7 @@ source "package/opus-tools/Config.in"
 source "package/pulseaudio/Config.in"
 source "package/tidsp-binaries/Config.in"
 source "package/tstools/Config.in"
+source "package/vlc/Config.in"
 source "package/vorbis-tools/Config.in"
 source "package/wavpack/Config.in"
 source "package/yavta/Config.in"
package/vlc/Config.in new file +15 -0
new file mode 100644
index 0000000..2335894
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_VLC
+	bool "vlc"
+	depends on (BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC) # spawn.h
+	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  VLC is a free and open source cross-platform multimedia player
+	  and framework that plays most multimedia files as well as DVD,
+	  Audio CD, VCD, and various streaming protocols.
+
+	  http://www.videolan.org/vlc/
+
+comment "vlc needs a uclibc snapshot or (e)glibc toolchain w/ largefile, wchar, threads"
+	depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC) || !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
package/vlc/vlc-0001-fix-link-error.patch new file +28 -0
new file mode 100644
index 0000000..0acae8f
@@ -0,0 +1,28 @@
+Fix a link error.
+
+Signed-off-by: Simon Dawson <[email protected]>
+
+diff -Nurp a/bin/Makefile.am b/bin/Makefile.am
+--- a/bin/Makefile.am	2013-12-03 09:12:34.000000000 +0000
++++ b/bin/Makefile.am	2014-01-06 22:03:34.888581851 +0000
+@@ -44,7 +44,7 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \
+ 	-DTOP_SRCDIR=\"$$(cd "$(top_srcdir)"; pwd)\" \
+ 	$(NULL)
+ vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
+-vlc_static_LDADD = $(vlc_LDADD)
++vlc_static_LDADD = $(vlc_LDADD) ../compat/libcompat.la
+ vlc_static_LDFLAGS = $(vlc_LDFLAGS)
+ 
+ if HAVE_WIN32
+diff -Nurp a/bin/Makefile.in b/bin/Makefile.in
+--- a/bin/Makefile.in	2013-12-07 16:17:01.000000000 +0000
++++ b/bin/Makefile.in	2014-01-06 22:04:10.888444978 +0000
+@@ -1049,7 +1049,7 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \
+ 	$(NULL)
+ 
+ vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
+-vlc_static_LDADD = $(vlc_LDADD)
++vlc_static_LDADD = $(vlc_LDADD) ../compat/libcompat.la
+ vlc_static_LDFLAGS = $(vlc_LDFLAGS) $(am__append_7)
+ @HAVE_WIN32_TRUE at vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
+ vlc_cache_gen_SOURCES = cachegen.c
package/vlc/vlc.mk new file +237 -0

237 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#1 lore raw

PATCH v3 1/1 vlc: new package

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"spdawson" == spdawson <[email protected]> writes:

From: Simon Dawson <[email protected]>

Signed-off-by Simon Dawson <[email protected]>

---
v3: As suggested by Baruch Siach, vlc builds with a uClibc snapshot toolchain
v2: Fixed some issues spotted by Thomas Petazzoni

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard