Skip to contentSkip to conversation

vlc: New package

PATCH Superseded Ismael Luceno 2 participants 2 messages Mar 14, 2012 – Mar 18, 2012

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 vlc: New package

---
Changes since v3:
* Removed scm-version bootstrapping support

Changes since v2:
* Replaced multi-line assignments to VLC_CONF_OPTS with individual ones for each line.
* Split additional commands required to build into macros and added them to the appropriate hook. Also added comments.

Changes since v1:
* Added a description for the package
* Described and signed-off the patch
* Added configuration knobs for all available dependencies and other build options.

 package/multimedia/Config.in                  |    1 +
 package/multimedia/vlc/Config.in              |  286 ++++++++++++++++++++
 package/multimedia/vlc/vlc-uclibc-fixes.patch |   25 ++
 package/multimedia/vlc/vlc.mk                 |  352 +++++++++++++++++++++++++
 4 files changed, 664 insertions(+), 0 deletions(-)
 create mode 100644 package/multimedia/vlc/Config.in
 create mode 100644 package/multimedia/vlc/vlc-uclibc-fixes.patch
 create mode 100644 package/multimedia/vlc/vlc.mk
package/multimedia/Config.in +1 -0
index a05d1d9..fc20d74 100644
@@ -44,6 +44,7 @@ source "package/multimedia/speex/Config.in"
 source "package/multimedia/tidsp-binaries/Config.in"
 source "package/multimedia/taglib/Config.in"
 source "package/multimedia/tremor/Config.in"
+source "package/multimedia/vlc/Config.in"
 source "package/multimedia/vorbis-tools/Config.in"
 source "package/multimedia/wavpack/Config.in"
 endmenu
package/multimedia/vlc/Config.in new file +286 -0

286 lines not on this page · raw message

package/multimedia/vlc/vlc-uclibc-fixes.patch new file +25 -0
new file mode 100644
index 0000000..5471b08
@@ -0,0 +1,25 @@
+Fixes compilation with uClibc, which doesn't provide gnu/libc-version.h nor
+gnu_get_libc_version.
+
+Signed-off-by: Ismael Luceno <[email protected]>
+
+diff -u a/src/posix/linux_specific.c b/src/posix/linux_specific.c
+--- a/src/posix/linux_specific.c	2012-02-08 16:43:30.000000000 -0200
++++ b/src/posix/linux_specific.c	2012-02-09 03:51:20.925504594 -0200
+@@ -74,14 +74,14 @@
+     return (path != NULL) ? path : strdup (PKGLIBDIR);
+ }
+ 
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+ # include <gnu/libc-version.h>
+ # include <stdlib.h>
+ #endif
+ 
+ void system_Init (void)
+ {
+-#ifdef __GLIBC__
++#if defined(__GLIBC__) && !defined(__UCLIBC__)
+     const char *glcv = gnu_get_libc_version ();
+ 
+     /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing,
package/multimedia/vlc/vlc.mk new file +352 -0

352 lines not on this page · raw message

Signature · 1 line
1.7.9.1
#1 lore raw

PATCH v4 1/1 vlc: New package

On Wednesday 14 March 2012 18:31:30 Ismael Luceno wrote:
[snip]

Quoted 1 line

+VLC_CONF_OPTS += --disable-rpath --enable-run-as-root

Have you tested this yourself? It should be VLC_CONF_OPT...

[snip]

Quoted 1 line

+ifeq ($(BR2_PACKAGE_AVCODEC),y)

This should be BR2_PACKAGE_VLC_AVCODEC.

package/multimedia/vlc/vlc.mk line 67

Quoted 6 lines
package/multimedia/vlc/vlc.mk new file +6 -0
+VLC_DEPENDENCIES += ffmpeg
+VLC_CONF_OPTS += --enable-avcodec --enable-avformat
+VLC_CONF_OPTS += --$(if $(BR2_PACKAGE_VLC_POSTPROC),en,dis)able-postproc
+VLC_CONF_OPTS += --$(if $(BR2_PACKAGE_VLC_SWSCALE),en,dis)able-swscale
+else
+VLC_CONF_OPTS += --disable-avcodec --disable-avformat

And here you should add --disable-postproc --disable-swscale

Quoted 1 line

+endif

[snip]

package/multimedia/vlc/vlc.mk line 89

Quoted 6 lines
package/multimedia/vlc/vlc.mk new file +6 -0
+ifeq ($(BR2_PACKAGE_VLC_V4L2),y)
+VLC_DEPENDENCIES += libv4l
+VLC_CONF_OPTS += --enable-libv4l2
+else
+VLC_CONF_OPTS += --disable-libv4l2
+endif

This should be en/disable-v4l2 (without the lib).

[snip]

Also, during the config, I see quite a few lines like this:
configure: WARNING: Library jack needed for jack was not found

This isn't really a problem at the moment for libraries that are not
included in buildroot, like jack (and I guess none of the others are included). But if any of these are ever included in buildroot, they will make the build of vlc unpredictable - if jack is built first, vlc will be built with jack support, but if vlc is built first it will be without jack support.

So ideally, everything which isn't supported should be --disable'd.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F