Skip to contentSkip to conversation

vlc: new package

PATCH New spdawson at gmail.com 3 participants 7 messages Jan 6, 2014 – Jan 7, 2014

lore
Share & tools
lore

spdawson at gmail.com

author
#0 lore raw

PATCH 1/1 vlc: new package

From: Simon Dawson <[email protected]>

Signed-off-by Simon Dawson <[email protected]>
---
 package/Config.in                         |   1 +
 package/vlc/Config.in                     |  12 ++
 package/vlc/vlc-0001-fix-link-error.patch |  28 ++++
 package/vlc/vlc.mk                        | 231 ++++++++++++++++++++++++++++++
 4 files changed, 272 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 +12 -0
new file mode 100644
index 0000000..83576e9
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_VLC
+	bool "vlc"
+	depends on BR2_TOOLCHAIN_USES_GLIBC # spawn.h
+	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 an (e)glibc toolchain"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
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 +231 -0

231 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 vlc: new package

Hi Simon,

Quoted 4 lines · spdawson at gmail.com

From: Simon Dawson <[email protected]>

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

---

[...]

package/vlc/Config.in line 3

Quoted 9 lines
package/vlc/Config.in new file +3 -0
new file mode 100644
index 0000000..83576e9
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_VLC
+	bool "vlc"
+	depends on BR2_TOOLCHAIN_USES_GLIBC # spawn.h

My uClibc toolchain has spawn.h as well. Is this a specific feature that is missing in uClibc?

package/vlc/Config.in line 12

Quoted 9 lines
package/vlc/Config.in new file +9 -0
+	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 an (e)glibc toolchain"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#2 lore raw

PATCH 1/1 vlc: new package

Hi Baruch. Thanks for the feedback.

Quoted 2 lines · Baruch Siach

My uClibc toolchain has spawn.h as well. Is this a specific feature that is missing in uClibc?

Are you sure that spawn.h is present? My uClibc 0.9.33.2 doesn't have it, and I can't see where it would come from... Apparently, the spawn function family is not currently supported in uClibc.

Simon.

#3 lore raw

PATCH 1/1 vlc: new package

Hi Simon,

Quoted 9 lines · Simon Dawson

Hi Baruch. Thanks for the feedback.

Quoted 2 lines · Baruch Siach

My uClibc toolchain has spawn.h as well. Is this a specific feature that is missing in uClibc?

Are you sure that spawn.h is present? My uClibc 0.9.33.2 doesn't have it, and I can't see where it would come from... Apparently, the spawn function family is not currently supported in uClibc.

This was added with uClibc commit 0dcf66744f53 (librt: add posix_spawn support), which is only in the snapshot version. I think you may add BR2_UCLIBC_VERSION_SNAPSHOT to the dependency list.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#4 lore raw

PATCH 1/1 vlc: new package

Hi Baruch,

Quoted 3 lines · Baruch Siach

This was added with uClibc commit 0dcf66744f53 (librt: add posix_spawn support), which is only in the snapshot version. I think you may add BR2_UCLIBC_VERSION_SNAPSHOT to the dependency list.

Ah, right. Thanks for the information.

Simon.

#5 lore raw

PATCH 1/1 vlc: new package

In reply to spdawson at gmail.com

Simon,

Quoted 1 line · spdawson at gmail.com

+ifeq ($(BR2_PACKAGE_ALSA_LIB),)

Maybe we should use positive logic everywhere, no? I.e invert all the conditions to be:

ifeq ($(BR2_<foo>),y)
use the feature
else
don't use the feature
endif

package/vlc/vlc.mk line 178

Quoted 4 lines
package/vlc/vlc.mk new file +4 -0
+ifeq ($(BR2_PACKAGE_LIVE555),)
+VLC_CONF_OPT += --disable-live555
+else
+VLC_CONF_OPT += --disable-live555

This should be --enable-live555

package/vlc/vlc.mk line 185

Quoted 7 lines
package/vlc/vlc.mk new file +7 -0
+VLC_DEPENDENCIES += live555
+endif
+
+ifeq ($(BR2_PACKAGE_LUA),)
+VLC_CONF_OPT += --disable-lua
+else
+VLC_CONF_OPT += --disable-lua

Same mistake.

package/vlc/vlc.mk line 192

Quoted 7 lines
package/vlc/vlc.mk new file +7 -0
+VLC_DEPENDENCIES += lua
+endif
+
+ifeq ($(BR2_PACKAGE_QT),)
+VLC_CONF_OPT += --disable-qt
+else
+VLC_CONF_OPT += --disable-qt

Ditto.

package/vlc/vlc.mk line 199

Quoted 7 lines
package/vlc/vlc.mk new file +7 -0
+VLC_DEPENDENCIES += qt
+endif
+
+ifeq ($(BR2_PACKAGE_SDL),)
+VLC_CONF_OPT += --disable-sdl
+else
+VLC_CONF_OPT += --disable-sdl

Ditto.

package/vlc/vlc.mk line 206

Quoted 7 lines
package/vlc/vlc.mk new file +7 -0
+VLC_DEPENDENCIES += sdl
+endif
+
+ifeq ($(BR2_PACKAGE_SDL_IMAGE),)
+VLC_CONF_OPT += --disable-sdl-image
+else
+VLC_CONF_OPT += --disable-sdl-image

Ditto.

Quoted 13 lines
package/vlc/vlc.mk new file +13 -0
+VLC_DEPENDENCIES += sdl-image
+endif
+
+ifeq ($(BR2_PACKAGE_SPEEX),)
+VLC_CONF_OPT += --disable-speex
+else
+VLC_CONF_OPT += --enable-speex
+VLC_DEPENDENCIES += speex
+endif
+
+ifeq ($(BR2_PACKAGE_TREMOR),)
+VLC_CONF_OPT += --disable-tremor
+else

package/vlc/vlc.mk line 229

Quoted 10 lines
package/vlc/vlc.mk new file +10 -0
+VLC_CONF_OPT += --enable-tremor
+VLC_DEPENDENCIES += tremor
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBX11),)
+VLC_CONF_OPT += --without-x
+else
+VLC_CONF_OPT += --with-x
+VLC_DEPENDENCIES += xlib_libX11
+endif

I wonder if this block shouldn't interact with the XCB block above.

Best regards,

Thomas

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

PATCH 1/1 vlc: new package

Hi Thomas. Thanks for the feedback.

Quoted 8 lines · Thomas Petazzoni

Maybe we should use positive logic everywhere, no? I.e invert all the conditions to be:

ifeq ($(BR2_<foo>),y)
use the feature
else
don't use the feature
endif

Yes, that would make more sense I think.

Quoted 6 lines

package/vlc/vlc.mk line 178

Quoted 4 lines
package/vlc/vlc.mk new file +4 -0
+ifeq ($(BR2_PACKAGE_LIVE555),)
+VLC_CONF_OPT += --disable-live555
+else
+VLC_CONF_OPT += --disable-live555

This should be --enable-live555

Oops. Will fix this, and all other occurrences of the same mistake.

Quoted 8 lines

package/vlc/vlc.mk line 229

Quoted 6 lines
package/vlc/vlc.mk new file +6 -0
+ifeq ($(BR2_PACKAGE_XLIB_LIBX11),)
+VLC_CONF_OPT += --without-x
+else
+VLC_CONF_OPT += --with-x
+VLC_DEPENDENCIES += xlib_libX11
+endif

I wonder if this block shouldn't interact with the XCB block above.

I'm not so sure. I know xlib_libX11 selects libxcb, but I don't see that mirroring this dependency will add any value to the vlc package make file. That said, I'm quite happy to change it if you think that the right thing to do.

Simon.