* [Buildroot] [PATCH] vlc: New package
@ 2012-02-28 0:02 Ismael Luceno
0 siblings, 0 replies; 15+ messages in thread
From: Ismael Luceno @ 2012-02-28 0:02 UTC (permalink / raw)
To: buildroot
Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
---
package/multimedia/Config.in | 1 +
package/multimedia/vlc/Config.in | 19 +++
package/multimedia/vlc/vlc-uclibc-fixes.patch | 25 ++++
package/multimedia/vlc/vlc.mk | 183 +++++++++++++++++++++++++
4 files changed, 228 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
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index a05d1d9..fc20d74 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -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
diff --git a/package/multimedia/vlc/Config.in b/package/multimedia/vlc/Config.in
new file mode 100644
index 0000000..56b29f8
--- /dev/null
+++ b/package/multimedia/vlc/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_VLC
+ bool "vlc"
+ 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/
+
+
+if BR2_PACKAGE_VLC
+
+config BR2_PACKAGE_VLC_FRONTEND
+ bool "Build and install frontend binary"
+ default y
+ help
+ This will install the video player.
+
+endif
diff --git a/package/multimedia/vlc/vlc-uclibc-fixes.patch b/package/multimedia/vlc/vlc-uclibc-fixes.patch
new file mode 100644
index 0000000..5471b08
--- /dev/null
+++ b/package/multimedia/vlc/vlc-uclibc-fixes.patch
@@ -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 <ismael.luceno@gmail.com>
+
+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,
diff --git a/package/multimedia/vlc/vlc.mk b/package/multimedia/vlc/vlc.mk
new file mode 100644
index 0000000..1d45dd9
--- /dev/null
+++ b/package/multimedia/vlc/vlc.mk
@@ -0,0 +1,183 @@
+#############################################################
+#
+# vlc
+#
+#############################################################
+VLC_VERSION = 2.0.0
+VLC_SOURCE= vlc-$(VLC_VERSION).tar.xz
+VLC_SITE = http://download.videolan.org/pub/videolan/vlc/$(VLC_VERSION)
+
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+VLC_DEPENDENCIES += alsa-lib
+VLC_CONF_OPTS += --enable-alsa
+else
+VLC_CONF_OPTS += --disable-alsa
+endif
+
+ifeq ($(BR2_PACKAGE_DIRECTFB),y)
+VLC_CONF_OPTS += --enable-directfb
+VLC_DEPENDENCIES += directfb
+else
+VLC_CONF_OPTS += --disable-directfb
+endif
+
+ifeq ($(BR2_PACKAGE_SDL),y)
+VLC_CONF_OPTS += --enable-sdl
+VLC_DEPENDENCIES += sdl
+else
+VLC_CONF_OPTS += --disable-sdl
+endif
+
+ifeq ($(BR2_PACKAGE_SDL_IMAGE),y)
+VLC_CONF_OPTS += --enable-sdl-image
+VLC_DEPENDENCIES += sdl_image
+else
+VLC_CONF_OPTS += --disable-sdl-image
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_FRONTEND),y)
+VLC_CONF_OPTS += --enable-vlc
+else
+VLC_CONF_OPTS += --disable-vlc
+endif
+
+ifeq ($(BR2_PACKAGE_LIBMAD),y)
+VLC_CONF_OPTS += --enable-mad
+VLC_DEPENDENCIES += libmad
+else
+VLC_CONF_OPTS += --disable-mad
+endif
+
+ifeq ($(BR2_PACKAGE_TREMOR),y)
+VLC_DEPENDENCIES += tremor
+VLC_CONF_OPTS += --enable-tremor
+else
+VLC_CONF_OPTS += --disable-tremor
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+VLC_DEPENDENCIES += libpng
+VLC_CONF_OPTS += --enable-png
+else
+VLC_CONF_OPTS += --disable-png
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG),y)
+VLC_DEPENDENCIES += ffmpeg
+VLC_CONF_OPTS += --enable-avcodec
+else
+VLC_CONF_OPTS += --disable-avcodec
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y)
+VLC_CONF_OPTS += --enable-postproc
+else
+VLC_CONF_OPTS += --disable-postproc
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
+VLC_CONF_OPTS += --enable-swscale
+else
+VLC_CONF_OPTS += --disable-swscale
+endif
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+VLC_DEPENDENCIES += dbus
+VLC_CONF_OPTS += --enable-dbus
+else
+VLC_CONF_OPTS += --disable-dbus
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+VLC_DEPENDENCIES += libgcrypt
+VLC_CONF_OPTS += --enable-libgcrypt
+else
+VLC_CONF_OPTS += --disable-libgcrypt
+endif
+
+ifeq ($(BR2_PACKAGE_LIBV4L),y)
+VLC_DEPENDENCIES += libv4l
+VLC_CONF_OPTS += --enable-libv4l2
+else
+VLC_CONF_OPTS += --disable-libv4l2
+endif
+
+ifeq ($(BR2_PACKAGE_LUA),y)
+VLC_DEPENDENCIES += lua
+VLC_CONF_OPTS += --enable-lua
+else
+VLC_CONF_OPTS += --disable-lua
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXCB),y)
+VLC_DEPENDENCIES += libxcb
+VLC_CONF_OPTS += --enable-xcb
+else
+VLC_CONF_OPTS += --disable-xcb
+endif
+
+ifeq ($(BR2_PACKAGE_LIVE555),y)
+VLC_DEPENDENCIES += live555
+VLC_CONF_OPTS += --enable-live555
+else
+VLC_CONF_OPTS += --disable-live555
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
+VLC_DEPENDENCIES += xlib_libX11
+VLC_CONF_OPTS += --with-x
+else
+VLC_CONF_OPTS += --without-x
+endif
+
+ifeq ($(BR2_PACKAGES_XLIB_LIBX11)$(BR2_PACKAGE_QT),yy)
+VLC_DEPENDENCIES += qt
+VLC_CONF_OPTS += --enable-qt4
+else
+VLC_CONF_OPTS += --disable-qt4
+endif
+
+VLC_DEPENDENCIES += \
+ $(if $(BR2_PACKAGE_FREETYPE),freetype) \
+ $(if $(BR2_PACKAGE_FLAC),flac) \
+ $(if $(BR2_PACKAGE_SPEEX),speex) \
+ $(if $(BR2_PACKAGE_LIBVORBIS),libvorbis) \
+ $(if $(BR2_PACKAGE_LIBTHEORA),libtheora) \
+ $(if $(BR2_PACKAGE_XLIB_LIBX11),xlib_libX11) \
+ $(if $(BR2_PACKAGE_XLIB_LIBXV),xlib_libXv)
+
+ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv7-a)
+VLC_CONF_OPTS += --enable-neon
+else
+VLC_CONF_OPTS += --disable-neon
+endif
+
+# FIXME: features disabled due lack of packages
+VLC_CONF_OPTS += --disable-a52
+
+define VLC_CONFIGURE_CMDS
+ echo $(VLC_VERSION) > $(@D)/src/revision.txt
+ (cd $(@D); rm -rf config.cache; \
+ test -x configure || ./bootstrap; \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --build=$(GNU_HOST_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --disable-rpath \
+ $(VLC_CONF_OPTS) \
+ CXXFLAGS="$(TARGET_CXXFLAGS)"; \
+ )
+ $(SED) '1i#define HAVE_VASPRINTF 1' $(@D)/config.h
+endef
+
+define VLC_INSTALL_TARGET_CMDS
+ find $(@D) -name '*.la' -exec $(SED) '/^relink_command=/d' '{}' +
+ touch $(@D)/modules/access/zip/libzip_plugin.la \
+ $(@D)/modules/misc/liblogger_plugin.la
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+endef
+
+$(eval $(call AUTOTARGETS))
--
1.7.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH] vlc: new package
@ 2013-03-19 10:05 Alexey Brodkin
2013-04-02 5:08 ` Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Alexey Brodkin @ 2013-03-19 10:05 UTC (permalink / raw)
To: buildroot
From: Alexey Brodkin <alexey.brodkin@synopsys.com>
Based on "[PATCHv6] vlc: New package" found here http://patchwork.ozlabs.org/patch/171335/
Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
Signed-off-by: Alexey Brodkin <alexey.brodkin@synopsys.com>
---
package/multimedia/Config.in | 1 +
package/multimedia/vlc/Config.in | 305 ++++++++++++++++++++
package/multimedia/vlc/vlc-uclibc-fixes.patch | 27 ++
package/multimedia/vlc/vlc.mk | 372 +++++++++++++++++++++++++
4 files changed, 705 insertions(+)
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
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 931e6d3..00f2ac2 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -23,6 +23,7 @@ source "package/multimedia/musepack/Config.in"
source "package/opus-tools/Config.in"
source "package/multimedia/pulseaudio/Config.in"
source "package/multimedia/tidsp-binaries/Config.in"
+source "package/multimedia/vlc/Config.in"
source "package/multimedia/vorbis-tools/Config.in"
source "package/multimedia/wavpack/Config.in"
source "package/yavta/Config.in"
diff --git a/package/multimedia/vlc/Config.in b/package/multimedia/vlc/Config.in
new file mode 100644
index 0000000..bf81d5b
--- /dev/null
+++ b/package/multimedia/vlc/Config.in
@@ -0,0 +1,305 @@
+menuconfig BR2_PACKAGE_VLC
+ bool "vlc"
+ select BR2_PACKAGE_ZLIB
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_USE_WCHAR
+ 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/
+
+
+if BR2_PACKAGE_VLC
+
+config BR2_PACKAGE_VLC_LOWMEM
+ bool "Optimize memory usage over performance"
+
+config BR2_PACKAGE_VLC_SOUT
+ bool "Enable streaming output"
+
+config BR2_PACKAGE_VLC_HTTPD
+ bool "Enable built-in HTTP server"
+
+config BR2_PACKAGE_VLC_VLM
+ bool "Enable stream manager (VLM)"
+
+config BR2_PACKAGE_VLC_SCREEN
+ bool "Screen capture support"
+
+comment "Audio output"
+
+config BR2_PACKAGE_VLC_ALSA
+ bool "ALSA support"
+ select BR2_PACKAGE_ALSA_LIB
+
+config BR2_PACKAGE_VLC_OSS
+ bool "OSS support"
+
+config BR2_PACKAGE_VLC_PULSE
+ bool "PulseAudio support"
+ select BR2_PACKAGE_PULSEAUDIO
+ depends on BR2_USE_WCHAR # pulseaudio
+
+comment "PulseAudio support requires a toolchain with WCHAR support"
+ depends on !BR2_USE_WCHAR
+
+config BR2_PACKAGE_VLC_SAMPLERATE
+ bool "Audio resampling support"
+ select BR2_PACKAGE_LIBSAMPLERATE
+
+comment "Video output"
+
+if BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_VLC_XCB
+ bool "XCB support"
+ select BR2_PACKAGE_LIBXCB
+ select BR2_PACKAGE_XCB_PROTO
+
+config BR2_PACKAGE_VLC_LIBX11
+ bool "Xlib support"
+ select BR2_PACKAGE_XLIB_LIBX11
+
+config BR2_PACKAGE_VLC_XV
+ bool "XVideo support (XCB)"
+ select BR2_PACKAGE_LIBXCB
+ select BR2_PACKAGE_XCB_PROTO
+ select BR2_PACKAGE_XPROTO_VIDEOPROTO
+
+config BR2_PACKAGE_VLC_GLX
+ bool "OpenGL (XCB GLX)"
+ select BR2_PACKAGE_LIBXCB
+ select BR2_PACKAGE_XCB_PROTO
+ select BR2_PACKAGE_XPROTO_GLPROTO
+
+endif # BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_VLC_DIRECTFB
+ bool "DirectFB support"
+ select BR2_PACKAGE_DIRECTFB
+
+config BR2_PACKAGE_VLC_SDL
+ bool "SDL support"
+ select BR2_PACKAGE_SDL
+
+config BR2_PACKAGE_VLC_SDL_IMAGE
+ bool "SDL-image support"
+ depends on BR2_PACKAGE_VLC_SDL
+ select BR2_PACKAGE_SDL_IMAGE
+
+config BR2_PACKAGE_VLC_FREETYPE
+ bool "FreeType support (for subtitles)"
+ select BR2_PACKAGE_FREETYPE
+
+config BR2_PACKAGE_VLC_FONTCONFIG
+ bool "fontconfig support"
+ depends on BR2_PACKAGE_VLC_FREETYPE
+ select BR2_PACKAGE_FONTCONFIG
+
+comment "Codecs"
+
+config BR2_PACKAGE_VLC_FAAD
+ bool "MPEG AAC"
+ select BR2_PACKAGE_FAAD2
+
+config BR2_PACKAGE_VLC_MAD
+ bool "MAD (Fixed-point, MPEG audio)"
+ select BR2_PACKAGE_LIBMAD
+
+config BR2_PACKAGE_VLC_TREMOR
+ bool "Tremor (Fixed-point, Vorbis)"
+ select BR2_PACKAGE_TREMOR
+
+config BR2_PACKAGE_VLC_AVCODEC
+ bool "FFmpeg (Many codecs)"
+ depends on BR2_LARGEFILE
+ depends on BR2_INET_IPV6
+ select BR2_PACKAGE_FFMPEG
+ help
+ There is a large number of codecs in FFmpeg/libavcodec.
+
+ To avoid duplication, select either the FFmpeg or the vlc
+ implementation for each codec, not both.
+
+if BR2_PACKAGE_VLC_AVCODEC
+
+config BR2_PACKAGE_VLC_POSTPROC
+ bool "Post-processing support"
+ select BR2_PACKAGE_FFMPEG_POSTPROC
+
+config BR2_PACKAGE_VLC_SWSCALE
+ bool "Software scaling support"
+ select BR2_PACKAGE_FFMPEG_SWSCALE
+
+endif # BR2_PACKAGE_VLC_AVCODEC
+
+config BR2_PACKAGE_VLC_LIBMPEG2
+ bool "MPEG-1/2 (libmpeg2)"
+ select BR2_PACKAGE_LIBMPEG2
+
+config BR2_PACKAGE_VLC_VORBIS
+ bool "Vorbis (Floating-point)"
+ select BR2_PACKAGE_LIBVORBIS
+
+config BR2_PACKAGE_VLC_THEORA
+ bool "Theora"
+ select BR2_PACKAGE_LIBTHEORA
+
+config BR2_PACKAGE_VLC_SPEEX
+ bool "Speex"
+ select BR2_PACKAGE_SPEEX
+
+config BR2_PACKAGE_VLC_FLAC
+ bool "FLAC"
+ select BR2_PACKAGE_FLAC
+
+config BR2_PACKAGE_VLC_PNG
+ bool "PNG support"
+ select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_VLC_SVG
+ bool "SVG support"
+ select BR2_PACKAGE_LIBRSVG
+
+comment "Container formats"
+
+config BR2_PACKAGE_VLC_OGG
+ bool "Ogg"
+ select BR2_PACKAGE_LIBOGG
+
+config BR2_PACKAGE_VLC_MUX_OGG
+ bool "Ogg mux support"
+ depends on BR2_PACKAGE_VLC_OGG
+
+comment "Input devices"
+
+config BR2_PACKAGE_VLC_VCD
+ bool "Built-in VCD and CD-DA support"
+
+config BR2_PACKAGE_VLC_DVD
+ bool "DVD support"
+ select BR2_PACKAGE_LIBDVDREAD
+
+config BR2_PACKAGE_VLC_DVDNAV
+ bool "DVD Navigation support"
+ depends on BR2_PACKAGE_VLC_DVD
+ select BR2_PACKAGE_LIBDVDNAV
+
+config BR2_PACKAGE_VLC_OPENCV
+ bool "OpenCV (Computer Vision) support"
+ select BR2_PACKAGE_OPENCV
+
+comment "Transport protocols"
+
+config BR2_PACKAGE_VLC_GVFS
+ bool "Gnome VFS support"
+ select BR2_PACKAGE_GVFS
+ depends on BR2_LARGEFILE && BR2_USE_WCHAR # gvfs
+
+comment "Gnome VFS support requires a toolchain with LARGEFILE and WCHAR support"
+ depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
+
+config BR2_PACKAGE_VLC_V4L2
+ bool "Video4Linux 2 support"
+ select BR2_PACKAGE_LIBV4L
+ depends on BR2_LARGEFILE
+
+comment "Video4Linux 2 support requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
+
+config BR2_PACKAGE_VLC_PVR
+ bool "Support PVR Video4Linux 2 cards"
+ depends on BR2_PACKAGE_VLC_V4L2
+
+config BR2_PACKAGE_VLC_LIVE555
+ bool "Sreaming support (RTP/RTCP, RTSP, SIP)"
+ select BR2_PACKAGE_LIVE555
+
+config BR2_PACKAGE_VLC_SMB
+ bool "Samba support (SMB/CIFS)"
+ select BR2_PACKAGES_SAMBA
+
+comment "Video filters and Visualization"
+
+config BR2_PACKAGE_VLC_VISUAL
+ bool "Visualization plugin"
+
+config BR2_PACKAGE_VLC_ATMO
+ bool "AtmoLight (homemade Philips Ambilight clone)"
+
+comment "Misc. options"
+
+config BR2_PACKAGE_VLC_MEDIALIB
+ bool "VLC Media Library"
+
+config BR2_PACKAGE_VLC_TAGLIB
+ bool "TagLib support"
+ select BR2_PACKAGE_TAGLIB
+
+config BR2_PACKAGE_VLC_DBUS
+ bool "DBus support"
+ select BR2_PACKAGE_DBUS
+
+config BR2_PACKAGE_VLC_LIBGCRYPT
+ bool "libgcrypt support"
+ select BR2_PACKAGE_LIBGCRYPT
+
+config BR2_PACKAGE_VLC_GNUTLS
+ bool "TLS/SSL support (using GnuTLS)"
+ select BR2_PACKAGE_GNUTLS
+
+config BR2_PACKAGE_VLC_SQLITE
+ bool "SQLite support"
+ select BR2_PACKAGE_SQLITE
+
+config BR2_PACKAGE_VLC_LUA
+ bool "Lua scripting support"
+ select BR2_PACKAGE_LUA
+
+config BR2_PACKAGE_VLC_LIBXML2
+ bool "libxml2 support"
+ select BR2_PACKAGE_LIBXML2
+
+comment "Service discovery"
+
+config BR2_PACKAGE_VLC_BONJOUR
+ bool "Bonjour / Avahi support"
+ select BR2_PACKAGE_AVAHI
+
+config BR2_PACKAGE_VLC_UDEV
+ bool "Udev support"
+ depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+
+config BR2_PACKAGE_VLC_UPNP
+ bool "Universal Plug and Play support (UPNP)"
+ select BR2_PACKAGE_LIBUPNP
+
+comment "Interface"
+
+config BR2_PACKAGE_VLC_FRONTEND
+ bool "Build and install frontend binary"
+ default y
+ help
+ This will install the video player.
+
+if BR2_PACKAGE_VLC_FRONTEND
+
+config BR2_PACKAGE_VLC_QT4
+ bool "QT4-based interface"
+ depends on BR2_PACKAGE_QT_GUI_X11
+
+config BR2_PACKAGE_VLC_NCURSES
+ bool "Ncurses text-based interface"
+ select BR2_PACKAGE_NCURSES
+
+config BR2_PACKAGE_VLC_XOSD
+ bool "X On Screen Display"
+ depends on BR2_PACKAGE_VLC_LIBX11
+
+config BR2_PACKAGE_VLC_FBOSD
+ bool "Framebuffer On Screen Display"
+
+endif # BR2_PACKAGE_VLC_FRONTEND
+endif # BR2_PACKAGE_VLC
diff --git a/package/multimedia/vlc/vlc-uclibc-fixes.patch b/package/multimedia/vlc/vlc-uclibc-fixes.patch
new file mode 100644
index 0000000..28e17a9
--- /dev/null
+++ b/package/multimedia/vlc/vlc-uclibc-fixes.patch
@@ -0,0 +1,27 @@
+Fixes compilation with uClibc, which doesn't provide gnu/libc-version.h nor
+gnu_get_libc_version.
+
+Upstream Status: Rejected
+
+Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
+
+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,
diff --git a/package/multimedia/vlc/vlc.mk b/package/multimedia/vlc/vlc.mk
new file mode 100644
index 0000000..6a0d4ce
--- /dev/null
+++ b/package/multimedia/vlc/vlc.mk
@@ -0,0 +1,372 @@
+#############################################################
+#
+# vlc
+#
+#############################################################
+VLC_VERSION = 2.0.0
+VLC_SOURCE= vlc-$(VLC_VERSION).tar.xz
+VLC_SITE = http://download.videolan.org/pub/videolan/vlc/$(VLC_VERSION)
+VLC_LICENSE = GPLv2
+VLC_LICENSE_FILES = COPYING
+VLC_DEPENDENCIES = zlib
+
+VLC_CONF_OPT += --disable-rpath --enable-run-as-root \
+ --disable-a52 \
+ --disable-jack \
+ --disable-mkv \
+ --disable-x264 \
+ --disable-libass \
+ --disable-crystalhd \
+ --disable-libva \
+ --disable-dca \
+ --disable-vcdx \
+ --disable-lirc \
+ --disable-goom \
+ --disable-projectm \
+ --disable-libcddb \
+ --disable-dc1394 \
+ --disable-bluray
+
+VLC_CFLAGS = $(TARGET_CFLAGS)
+VLC_CFLAGS += -std=gnu99
+
+ifeq ($(BR2_PACKAGE_VLC_ALSA),y)
+VLC_DEPENDENCIES += alsa-lib
+VLC_CONF_OPT += --enable-alsa
+else
+VLC_CONF_OPT += --disable-alsa
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_DIRECTFB),y)
+VLC_CONF_OPT += --enable-directfb
+VLC_DEPENDENCIES += directfb
+else
+VLC_CONF_OPT += --disable-directfb
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_SDL),y)
+VLC_CONF_OPT += --enable-sdl
+VLC_DEPENDENCIES += sdl
+else
+VLC_CONF_OPT += --disable-sdl
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_SDL_IMAGE),y)
+VLC_CONF_OPT += --enable-sdl-image
+VLC_DEPENDENCIES += sdl_image
+else
+VLC_CONF_OPT += --disable-sdl-image
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_MAD),y)
+VLC_CONF_OPT += --enable-mad
+VLC_DEPENDENCIES += libmad
+else
+VLC_CONF_OPT += --disable-mad
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_TREMOR),y)
+VLC_DEPENDENCIES += tremor
+VLC_CONF_OPT += --enable-tremor
+else
+VLC_CONF_OPT += --disable-tremor
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_PNG),y)
+VLC_DEPENDENCIES += libpng
+VLC_CONF_OPT += --enable-png
+else
+VLC_CONF_OPT += --disable-png
+endif
+
+ifeq ($(BR2_PACKAGE_AVCODEC),y)
+VLC_DEPENDENCIES += ffmpeg
+VLC_CONF_OPT += --enable-avcodec --enable-avformat
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_POSTPROC),en,dis)able-postproc
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_SWSCALE),en,dis)able-swscale
+else
+VLC_CONF_OPT += $(foreach i,avcodec avformat postproc swscale,--disable-$i)
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_DBUS),y)
+VLC_DEPENDENCIES += dbus
+VLC_CONF_OPT += --enable-dbus
+else
+VLC_CONF_OPT += --disable-dbus
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_LIBGCRYPT),y)
+VLC_DEPENDENCIES += libgcrypt
+VLC_CONF_OPT += --enable-libgcrypt
+else
+VLC_CONF_OPT += --disable-libgcrypt
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_V4L2),y)
+VLC_DEPENDENCIES += libv4l
+VLC_CONF_OPT += --enable-libv4l2
+else
+VLC_CONF_OPT += --disable-libv4l2
+endif
+
+ifeq ($(BR2_PACKAGE_LUA),y)
+VLC_DEPENDENCIES += lua
+VLC_CONF_OPT += --enable-lua
+else
+VLC_CONF_OPT += --disable-lua
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_XCB),y)
+VLC_DEPENDENCIES += libxcb
+VLC_CONF_OPT += --enable-xcb
+else
+VLC_CONF_OPT += --disable-xcb
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_LIVE555),y)
+VLC_DEPENDENCIES += live555
+VLC_CONF_OPT += --enable-live555
+else
+VLC_CONF_OPT += --disable-live555
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_LIBX11),y)
+VLC_DEPENDENCIES += xlib_libX11
+VLC_CONF_OPT += --with-x
+else
+VLC_CONF_OPT += --without-x
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_QT4),y)
+VLC_DEPENDENCIES += qt
+VLC_CONF_OPT += --enable-qt4
+else
+VLC_CONF_OPT += --disable-qt4
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_VORBIS),y)
+VLC_DEPENDENCIES += libvorbis
+VLC_CONF_OPT += --enable-vorbis
+else
+VLC_CONF_OPT += --disable-vorbis
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_THEORA),y)
+VLC_DEPENDENCIES += libtheora
+VLC_CONF_OPT += --enable-theora
+else
+VLC_CONF_OPT += --disable-theora
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_SPEEX),y)
+VLC_DEPENDENCIES += speex
+VLC_CONF_OPT += --enable-speex
+else
+VLC_CONF_OPT += --disable-speex
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_FLAC),y)
+VLC_DEPENDENCIES += flac
+VLC_CONF_OPT += --enable-flac
+else
+VLC_CONF_OPT += --disable-flac
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_XV),y)
+VLC_DEPENDENCIES += libxcb xcb-proto xproto_videoproto
+VLC_CONF_OPT += --enable-xvideo
+else
+VLC_CONF_OPT += --disable-xvideo
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_FREETYPE),y)
+VLC_DEPENDENCIES += freetype
+VLC_CONF_OPT += --enable-freetype
+else
+VLC_CONF_OPT += --disable-freetype
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_FAAD),y)
+VLC_DEPENDENCIES += faad2
+VLC_CONF_OPT += --enable-faad
+else
+VLC_CONF_OPT += --disable-faad
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_SVG),y)
+VLC_DEPENDENCIES += librsvg
+VLC_CONF_OPT += --enable-svg
+else
+VLC_CONF_OPT += --disable-svg
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_OGG),y)
+VLC_DEPENDENCIES += libogg
+VLC_CONF_OPT += --enable-ogg
+else
+VLC_CONF_OPT += --disable-ogg
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_MUX_OGG),y)
+VLC_CONF_OPT += --enable-mux_ogg
+else
+VLC_CONF_OPT += --disable-mux_ogg
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_GLX),y)
+VLC_DEPENDENCIES += libxcb xcb-proto xproto_glproto
+VLC_CONF_OPT += --enable-glx
+else
+VLC_CONF_OPT += --disable-glx
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_SQLITE),y)
+VLC_DEPENDENCIES += sqlite
+VLC_CONF_OPT += --enable-sqlite
+else
+VLC_CONF_OPT += --disable-sqlite
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_NCURSES),y)
+VLC_DEPENDENCIES += ncurses
+VLC_CONF_OPT += --enable-ncurses
+else
+VLC_CONF_OPT += --disable-ncurses
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_GVFS),y)
+VLC_DEPENDENCIES += gvfs
+VLC_CONF_OPT += --enable-gnomevfs
+else
+VLC_CONF_OPT += --disable-gnomevfs
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_DVD),y)
+VLC_DEPENDENCIES += libdvdread
+VLC_CONF_OPT += --enable-dvdread
+else
+VLC_CONF_OPT += --disable-dvdread
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_DVDNAV),y)
+VLC_DEPENDENCIES += libdvdnav
+VLC_CONF_OPT += --enable-dvdnav
+else
+VLC_CONF_OPT += --disable-dvdnav
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_GNUTLS),y)
+VLC_DEPENDENCIES += gnutls
+VLC_CONF_OPT += --enable-gnutls
+else
+VLC_CONF_OPT += --disable-gnutls
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_LIBMPEG2),y)
+VLC_DEPENDENCIES += libmpeg2
+VLC_CONF_OPT += --enable-libmpeg2
+else
+VLC_CONF_OPT += --disable-libmpeg2
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_LIBXML2),y)
+VLC_DEPENDENCIES += libxml2
+VLC_CONF_OPT += --enable-libxml2
+else
+VLC_CONF_OPT += --disable-libxml2
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_PULSE),y)
+VLC_DEPENDENCIES += pulseaudio
+VLC_CONF_OPT += --enable-pulse
+else
+VLC_CONF_OPT += --disable-pulse
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_SAMPLERATE),y)
+VLC_DEPENDENCIES += libsamplerate
+VLC_CONF_OPT += --enable-samplerate
+else
+VLC_CONF_OPT += --disable-samplerate
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_TAGLIB),y)
+VLC_DEPENDENCIES += taglib
+VLC_CONF_OPT += --enable-taglib
+else
+VLC_CONF_OPT += --disable-taglib
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_BONJOUR),y)
+VLC_DEPENDENCIES += avahi
+VLC_CONF_OPT += --enable-bonjour
+else
+VLC_CONF_OPT += --disable-bonjour
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_UDEV),y)
+VLC_DEPENDENCIES += udev
+VLC_CONF_OPT += --enable-udev
+else
+VLC_CONF_OPT += --disable-udev
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_UPNP),y)
+VLC_DEPENDENCIES += libupnp
+VLC_CONF_OPT += --enable-upnp
+else
+VLC_CONF_OPT += --disable-upnp
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_SMB),y)
+VLC_DEPENDENCIES += samba
+VLC_CONF_OPT += --enable-smb
+else
+VLC_CONF_OPT += --disable-smb
+endif
+
+ifeq ($(BR2_PACKAGE_VLC_OPENCV),y)
+VLC_DEPENDENCIES += opencv
+VLC_CONF_OPT += --enable-opencv
+else
+VLC_CONF_OPT += --disable-opencv
+endif
+
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_LOWMEM),en,dis)able-optimize-memory
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_SOUT),en,dis)able-sout
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_HTTPD),en,dis)able-httpd
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_VLM),en,dis)able-vlm
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_SCREEN),en,dis)able-screen
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_VCD),en,dis)able-vcd
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_VISUAL),en,dis)able-visual
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_ATMO),en,dis)able-atmo
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_OSS),en,dis)able-oss
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_FRONTEND),en,dis)able-vlc
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_XOSD),en,dis)able-xosd
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_FBOSD),en,dis)able-fbosd
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_PVR),en,dis)able-pvr
+VLC_CONF_OPT += --$(if $(BR2_PACKAGE_VLC_MEDIALIB),en,dis)able-media-library
+
+ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv7-a)
+VLC_CONF_OPT += --enable-neon
+else
+VLC_CONF_OPT += --disable-neon
+endif
+
+# The configure script fails to detect vasprintf on uClibc. The issue was fixed
+# recently in scm, so this code should be removed upon next version bump.
+define VLC_FIX_CONF
+ $(SED) '/HAVE_VASPRINTF/d;1i#define HAVE_VASPRINTF 1' $(@D)/config.h
+endef
+VLC_POST_CONFIGURE_HOOKS += VLC_FIX_CONF
+
+# The following removes the relink_command. If not removed, libtool tries to
+# relink against the host libraries, instead of the sysroot.
+define VLC_FIX_LA_FILES
+ find $(@D) -name '*.la' -exec $(SED) '/^relink_command=/d' '{}' +
+ touch $(@D)/modules/access/zip/libzip_plugin.la \
+ $(@D)/modules/misc/liblogger_plugin.la
+endef
+VLC_POST_BUILD_HOOKS += VLC_FIX_LA_FILES
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH] vlc: new package
2013-03-19 10:05 [Buildroot] [PATCH] vlc: new package Alexey Brodkin
@ 2013-04-02 5:08 ` Bernd Kuhls
2013-04-26 7:33 ` Alexey Brodkin
2013-05-06 15:35 ` Alexey Brodkin
2014-02-04 9:40 ` Thomas Petazzoni
2 siblings, 1 reply; 15+ messages in thread
From: Bernd Kuhls @ 2013-04-02 5:08 UTC (permalink / raw)
To: buildroot
Hi,
Alexey Brodkin <Alexey.Brodkin@synopsys.com>
wrote in news:1363687526-8469-1-git-send-email-abrodkin at synopsys.com:
> +ifeq ($(BR2_PACKAGE_AVCODEC),y)
shouldn?t this be called BR2_PACKAGE_VLC_AVCODEC?
> +ifeq ($(BR2_PACKAGE_LUA),y)
and this BR2_PACKAGE_VLC_LUA?
Regards, Bernd
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
2013-04-02 5:08 ` Bernd Kuhls
@ 2013-04-26 7:33 ` Alexey Brodkin
0 siblings, 0 replies; 15+ messages in thread
From: Alexey Brodkin @ 2013-04-26 7:33 UTC (permalink / raw)
To: buildroot
On 04/02/2013 09:08 AM, Bernd Kuhls wrote:
> Hi,
>
> Alexey Brodkin <Alexey.Brodkin-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
> wrote in
news:1363687526-8469-1-git-send-email-abrodkin-HKixBCOQz3hWk0Htik3J/w at public.gmane.org:
>
>> +ifeq ($(BR2_PACKAGE_AVCODEC),y)
>
> shouldn?t this be called BR2_PACKAGE_VLC_AVCODEC?
>
>> +ifeq ($(BR2_PACKAGE_LUA),y)
>
> and this BR2_PACKAGE_VLC_LUA?
>
> Regards, Bernd
Hi Bernd,
The idea is to check if "avcodec" and "lua" packages were selected in
configuration utility (menuconfig/xconfig etc).
Indeed we may rely on VLC's symbols BR2_PACKAGE_AVCODEC and
BR2_PACKAGE_LUA that select BR2_PACKAGE_FFMPEG and BR2_PACKAGE_LUA
accordingly.
So initial proposal is to sort of double check if we do have "avcodec"
and "lua" selected.
Even though you believe it's better to check VLC's own symbols I may do
a re-spin.
-Alexey
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
2013-03-19 10:05 [Buildroot] [PATCH] vlc: new package Alexey Brodkin
2013-04-02 5:08 ` Bernd Kuhls
@ 2013-05-06 15:35 ` Alexey Brodkin
2014-02-04 9:40 ` Thomas Petazzoni
2 siblings, 0 replies; 15+ messages in thread
From: Alexey Brodkin @ 2013-05-06 15:35 UTC (permalink / raw)
To: buildroot
On 03/19/2013 02:05 PM, Alexey Brodkin wrote:
> From: Alexey Brodkin<alexey.brodkin-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
>
> Based on "[PATCHv6] vlc: New package" found herehttp://patchwork.ozlabs.org/patch/171335/
>
> Signed-off-by: Ismael Luceno<ismael.luceno-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Alexey Brodkin<alexey.brodkin-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
Hi Yann,
from here http://patchwork.ozlabs.org/patch/228982/ I see that you are
assigned for this patch review.
I'm wondering if there's a chance to get it finally reviewed?
Regards,
Alexey
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
2013-03-19 10:05 [Buildroot] [PATCH] vlc: new package Alexey Brodkin
2013-04-02 5:08 ` Bernd Kuhls
2013-05-06 15:35 ` Alexey Brodkin
@ 2014-02-04 9:40 ` Thomas Petazzoni
2014-02-04 9:55 ` Alexey Brodkin
2 siblings, 1 reply; 15+ messages in thread
From: Thomas Petazzoni @ 2014-02-04 9:40 UTC (permalink / raw)
To: buildroot
Dear Alexey Brodkin,
On Tue, 19 Mar 2013 14:05:26 +0400, Alexey Brodkin wrote:
> From: Alexey Brodkin <alexey.brodkin@synopsys.com>
>
> Based on "[PATCHv6] vlc: New package" found here http://patchwork.ozlabs.org/patch/171335/
>
> Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
> Signed-off-by: Alexey Brodkin <alexey.brodkin@synopsys.com>
> ---
> package/multimedia/Config.in | 1 +
> package/multimedia/vlc/Config.in | 305 ++++++++++++++++++++
> package/multimedia/vlc/vlc-uclibc-fixes.patch | 27 ++
> package/multimedia/vlc/vlc.mk | 372 +++++++++++++++++++++++++
> 4 files changed, 705 insertions(+)
> 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
We have merged a separate proposal to introduce VLC recently, see:
http://git.buildroot.net/buildroot/tree/package/vlc/.
It does not include as many features as the patch you were proposing,
but your patch was introducing so many configuration options at once
that it was a bit hard to do some good testing of it. Therefore, we've
merged something slightly simpler, and we invite you do send follow-up
patches to improve what we have now to support the additional features
that you think are missing.
Thanks a lot for your contribution, and sorry for the time it took to
get a VLC package merged.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
2014-02-04 9:40 ` Thomas Petazzoni
@ 2014-02-04 9:55 ` Alexey Brodkin
0 siblings, 0 replies; 15+ messages in thread
From: Alexey Brodkin @ 2014-02-04 9:55 UTC (permalink / raw)
To: buildroot
Hello Thomas,
On Tue, 2014-02-04 at 10:40 +0100, Thomas Petazzoni wrote:
> Dear Alexey Brodkin,
>
> On Tue, 19 Mar 2013 14:05:26 +0400, Alexey Brodkin wrote:
> > From: Alexey Brodkin <alexey.brodkin@synopsys.com>
> >
> > Based on "[PATCHv6] vlc: New package" found here http://patchwork.ozlabs.org/patch/171335/
> >
> > Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
> > Signed-off-by: Alexey Brodkin <alexey.brodkin@synopsys.com>
> > ---
> > package/multimedia/Config.in | 1 +
> > package/multimedia/vlc/Config.in | 305 ++++++++++++++++++++
> > package/multimedia/vlc/vlc-uclibc-fixes.patch | 27 ++
> > package/multimedia/vlc/vlc.mk | 372 +++++++++++++++++++++++++
> > 4 files changed, 705 insertions(+)
> > 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
>
> We have merged a separate proposal to introduce VLC recently, see:
> http://git.buildroot.net/buildroot/tree/package/vlc/.
>
> It does not include as many features as the patch you were proposing,
> but your patch was introducing so many configuration options at once
> that it was a bit hard to do some good testing of it. Therefore, we've
> merged something slightly simpler, and we invite you do send follow-up
> patches to improve what we have now to support the additional features
> that you think are missing.
>
> Thanks a lot for your contribution, and sorry for the time it took to
> get a VLC package merged.
>
This is a very good news - VLC was missign from buildroot for so long
and now it's there.
Frankly these days I don't [need to] use VLC on embedded devices so I
don't really have any requirements for any extra configurability of VLC
in buildroot.
As soon as I face any lacking option I'll submit a new patch.
Thank you guys so much for driving development of U-Boot!
Regards,
Alexey
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
@ 2013-04-02 16:05 Alexey Brodkin
0 siblings, 0 replies; 15+ messages in thread
From: Alexey Brodkin @ 2013-04-02 16:05 UTC (permalink / raw)
To: buildroot
On 04/02/2013 09:08 AM, Bernd Kuhls wrote:
> Hi,
>
> Alexey Brodkin <Alexey.Brodkin-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
> wrote in
news:1363687526-8469-1-git-send-email-abrodkin-HKixBCOQz3hWk0Htik3J/w at public.gmane.org:
>
>> +ifeq ($(BR2_PACKAGE_AVCODEC),y)
>
> shouldn?t this be called BR2_PACKAGE_VLC_AVCODEC?
>
>> +ifeq ($(BR2_PACKAGE_LUA),y)
>
> and this BR2_PACKAGE_VLC_LUA?
>
> Regards, Bernd
Hi Bernd,
The idea is to check if "avcodec" and "lua" packages were selected in
configuration utility (menuconfig/xconfig etc).
Indeed we may rely on VLC's symbols BR2_PACKAGE_AVCODEC and
BR2_PACKAGE_LUA that select BR2_PACKAGE_FFMPEG and BR2_PACKAGE_LUA
accordingly.
So initial proposal is to sort of double check if we do have "avcodec"
and "lua" selected.
Even though you believe it's better to check VLC's own symbols I may do
a re-spin.
-Alexey
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
@ 2014-01-06 22:09 spdawson at gmail.com
2014-01-07 3:39 ` Baruch Siach
2014-01-07 6:26 ` Thomas Petazzoni
0 siblings, 2 replies; 15+ messages in thread
From: spdawson at gmail.com @ 2014-01-06 22:09 UTC (permalink / raw)
To: buildroot
From: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
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
diff --git a/package/Config.in b/package/Config.in
index e502cde..02097ff 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/vlc/Config.in b/package/vlc/Config.in
new file mode 100644
index 0000000..83576e9
--- /dev/null
+++ b/package/vlc/Config.in
@@ -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
diff --git a/package/vlc/vlc-0001-fix-link-error.patch b/package/vlc/vlc-0001-fix-link-error.patch
new file mode 100644
index 0000000..0acae8f
--- /dev/null
+++ b/package/vlc/vlc-0001-fix-link-error.patch
@@ -0,0 +1,28 @@
+Fix a link error.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+
+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
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
new file mode 100644
index 0000000..1958f87
--- /dev/null
+++ b/package/vlc/vlc.mk
@@ -0,0 +1,231 @@
+################################################################################
+#
+# vlc
+#
+################################################################################
+
+VLC_VERSION = 2.1.2
+VLC_SITE = http://download.videolan.org/pub/videolan/vlc/$(VLC_VERSION)
+VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
+VLC_LICENSE = GPLv2+ LGPLv2.1+
+VLC_LICENSE_FILES = COPYING COPYING.LIB
+
+VLC_CONF_OPT += \
+ --disable-a52 \
+ --disable-shout \
+ --disable-mod \
+ --disable-faad \
+ --disable-twolame \
+ --disable-dca \
+ --disable-dirac \
+ --disable-schroedinger \
+ --disable-quicksync \
+ --disable-fluidsynth \
+ --disable-zvbi \
+ --disable-libass \
+ --disable-kate \
+ --disable-caca \
+ --disable-jack \
+ --disable-samplerate \
+ --disable-chromaprint \
+ --disable-goom \
+ --disable-projectm \
+ --disable-vsxu \
+ --disable-udev \
+ --disable-mtp
+
+ifeq ($(BR2_PACKAGE_ALSA_LIB),)
+VLC_CONF_OPT += --disable-alsa
+else
+VLC_CONF_OPT += --enable-alsa
+VLC_DEPENDENCIES += alsa-lib
+endif
+
+ifeq ($(BR2_PACKAGE_AVAHI),)
+VLC_CONF_OPT += --disable-bonjour
+else
+VLC_CONF_OPT += --enable-bonjour
+VLC_DEPENDENCIES += avahi
+endif
+
+ifeq ($(BR2_PACKAGE_DBUS),)
+VLC_CONF_OPT += --disable-dbus
+else
+VLC_CONF_OPT += --enable-dbus
+VLC_DEPENDENCIES += dbus
+endif
+
+ifeq ($(BR2_PACKAGE_DIRECTFB),)
+VLC_CONF_OPT += --disable-directfb
+else
+VLC_CONF_OPT += --enable-directfb
+VLC_DEPENDENCIES += directfb
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG),)
+VLC_CONF_OPT += --disable-avcodec
+else
+VLC_CONF_OPT += --enable-avcodec
+VLC_DEPENDENCIES += ffmpeg
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),)
+VLC_CONF_OPT += --disable-postproc
+else
+VLC_CONF_OPT += --enable-postproc
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),)
+VLC_CONF_OPT += --disable-swscale
+else
+VLC_CONF_OPT += --enable-swscale
+endif
+
+ifeq ($(BR2_PACKAGE_FLAC),)
+VLC_CONF_OPT += --disable-flac
+else
+VLC_CONF_OPT += --enable-flac
+VLC_DEPENDENCIES += flac
+endif
+
+ifeq ($(BR2_PACKAGE_OPUS),)
+VLC_CONF_OPT += --disable-opus
+else
+VLC_CONF_OPT += --enable-opus
+VLC_DEPENDENCIES += opus
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),)
+VLC_CONF_OPT += --disable-libgcrypt
+else
+VLC_CONF_OPT += --enable-libgcrypt
+VLC_DEPENDENCIES += libgcrypt
+endif
+
+ifeq ($(BR2_PACKAGE_LIBMAD),)
+VLC_CONF_OPT += --disable-mad
+else
+VLC_CONF_OPT += --enable-mad
+VLC_DEPENDENCIES += libmad
+endif
+
+ifeq ($(BR2_PACKAGE_LIBMPEG2),)
+VLC_CONF_OPT += --disable-libmpeg2
+else
+VLC_CONF_OPT += --enable-libmpeg2
+VLC_DEPENDENCIES += libmpeg2
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),)
+VLC_CONF_OPT += --disable-png
+else
+VLC_CONF_OPT += --enable-png
+VLC_DEPENDENCIES += libpng
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSVG),)
+VLC_CONF_OPT += --disable-svg
+else
+VLC_CONF_OPT += --enable-svg
+VLC_DEPENDENCIES += libsvg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBTHEORA),)
+VLC_CONF_OPT += --disable-theora
+else
+VLC_CONF_OPT += --enable-theora
+VLC_DEPENDENCIES += theora
+endif
+
+ifeq ($(BR2_PACKAGE_LIBUPNP),)
+VLC_CONF_OPT += --disable-upnp
+else
+VLC_CONF_OPT += --enable-upnp
+VLC_DEPENDENCIES += libupnp
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVORBIS),)
+VLC_CONF_OPT += --disable-vorbis
+else
+VLC_CONF_OPT += --enable-vorbis
+VLC_DEPENDENCIES += libvorbis
+endif
+
+ifeq ($(BR2_PACKAGE_LIBV4L),)
+VLC_CONF_OPT += --disable-v4l2
+else
+VLC_CONF_OPT += --enable-v4l2
+VLC_DEPENDENCIES += libv4l
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXCB),)
+VLC_CONF_OPT += --disable-xcb
+else
+VLC_CONF_OPT += --enable-xcb
+VLC_DEPENDENCIES += libxcb
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXML2),)
+VLC_CONF_OPT += --disable-libxml2
+else
+VLC_CONF_OPT += --enable-libxml2
+VLC_DEPENDENCIES += libxml2
+endif
+
+ifeq ($(BR2_PACKAGE_LIVE555),)
+VLC_CONF_OPT += --disable-live555
+else
+VLC_CONF_OPT += --disable-live555
+VLC_DEPENDENCIES += live555
+endif
+
+ifeq ($(BR2_PACKAGE_LUA),)
+VLC_CONF_OPT += --disable-lua
+else
+VLC_CONF_OPT += --disable-lua
+VLC_DEPENDENCIES += lua
+endif
+
+ifeq ($(BR2_PACKAGE_QT),)
+VLC_CONF_OPT += --disable-qt
+else
+VLC_CONF_OPT += --disable-qt
+VLC_DEPENDENCIES += qt
+endif
+
+ifeq ($(BR2_PACKAGE_SDL),)
+VLC_CONF_OPT += --disable-sdl
+else
+VLC_CONF_OPT += --disable-sdl
+VLC_DEPENDENCIES += sdl
+endif
+
+ifeq ($(BR2_PACKAGE_SDL_IMAGE),)
+VLC_CONF_OPT += --disable-sdl-image
+else
+VLC_CONF_OPT += --disable-sdl-image
+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
+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
+
+$(eval $(autotools-package))
--
1.8.3.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
2014-01-06 22:09 spdawson at gmail.com
@ 2014-01-07 3:39 ` Baruch Siach
2014-01-07 11:17 ` Simon Dawson
2014-01-07 6:26 ` Thomas Petazzoni
1 sibling, 1 reply; 15+ messages in thread
From: Baruch Siach @ 2014-01-07 3:39 UTC (permalink / raw)
To: buildroot
Hi Simon,
On Mon, Jan 06, 2014 at 10:09:02PM +0000, spdawson at gmail.com wrote:
> From: Simon Dawson <spdawson@gmail.com>
>
> Signed-off-by: Simon Dawson <spdawson@gmail.com>
> ---
[...]
> diff --git a/package/vlc/Config.in b/package/vlc/Config.in
> new file mode 100644
> index 0000000..83576e9
> --- /dev/null
> +++ b/package/vlc/Config.in
> @@ -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?
> + 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
--
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 -
^ permalink raw reply [flat|nested] 15+ messages in thread* [Buildroot] [PATCH] vlc: new package
2014-01-07 3:39 ` Baruch Siach
@ 2014-01-07 11:17 ` Simon Dawson
2014-01-07 11:51 ` Baruch Siach
0 siblings, 1 reply; 15+ messages in thread
From: Simon Dawson @ 2014-01-07 11:17 UTC (permalink / raw)
To: buildroot
Hi Baruch. Thanks for the feedback.
On 7 January 2014 03:39, Baruch Siach <baruch@tkos.co.il> wrote:
> 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.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
2014-01-07 11:17 ` Simon Dawson
@ 2014-01-07 11:51 ` Baruch Siach
2014-01-07 11:52 ` Simon Dawson
0 siblings, 1 reply; 15+ messages in thread
From: Baruch Siach @ 2014-01-07 11:51 UTC (permalink / raw)
To: buildroot
Hi Simon,
On Tue, Jan 07, 2014 at 11:17:14AM +0000, Simon Dawson wrote:
> Hi Baruch. Thanks for the feedback.
>
> On 7 January 2014 03:39, Baruch Siach <baruch@tkos.co.il> wrote:
> > 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
--
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 -
^ permalink raw reply [flat|nested] 15+ messages in thread* [Buildroot] [PATCH] vlc: new package
2014-01-07 11:51 ` Baruch Siach
@ 2014-01-07 11:52 ` Simon Dawson
0 siblings, 0 replies; 15+ messages in thread
From: Simon Dawson @ 2014-01-07 11:52 UTC (permalink / raw)
To: buildroot
Hi Baruch,
On 7 January 2014 11:51, Baruch Siach <baruch@tkos.co.il> wrote:
> 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.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
2014-01-06 22:09 spdawson at gmail.com
2014-01-07 3:39 ` Baruch Siach
@ 2014-01-07 6:26 ` Thomas Petazzoni
2014-01-07 11:20 ` Simon Dawson
1 sibling, 1 reply; 15+ messages in thread
From: Thomas Petazzoni @ 2014-01-07 6:26 UTC (permalink / raw)
To: buildroot
Simon,
On Mon, 6 Jan 2014 22:09:02 +0000, spdawson at gmail.com wrote:
> +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
> +ifeq ($(BR2_PACKAGE_LIVE555),)
> +VLC_CONF_OPT += --disable-live555
> +else
> +VLC_CONF_OPT += --disable-live555
This should be --enable-live555
> +VLC_DEPENDENCIES += live555
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LUA),)
> +VLC_CONF_OPT += --disable-lua
> +else
> +VLC_CONF_OPT += --disable-lua
Same mistake.
> +VLC_DEPENDENCIES += lua
> +endif
> +
> +ifeq ($(BR2_PACKAGE_QT),)
> +VLC_CONF_OPT += --disable-qt
> +else
> +VLC_CONF_OPT += --disable-qt
Ditto.
> +VLC_DEPENDENCIES += qt
> +endif
> +
> +ifeq ($(BR2_PACKAGE_SDL),)
> +VLC_CONF_OPT += --disable-sdl
> +else
> +VLC_CONF_OPT += --disable-sdl
Ditto.
> +VLC_DEPENDENCIES += sdl
> +endif
> +
> +ifeq ($(BR2_PACKAGE_SDL_IMAGE),)
> +VLC_CONF_OPT += --disable-sdl-image
> +else
> +VLC_CONF_OPT += --disable-sdl-image
Ditto.
> +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
> +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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH] vlc: new package
2014-01-07 6:26 ` Thomas Petazzoni
@ 2014-01-07 11:20 ` Simon Dawson
0 siblings, 0 replies; 15+ messages in thread
From: Simon Dawson @ 2014-01-07 11:20 UTC (permalink / raw)
To: buildroot
Hi Thomas. Thanks for the feedback.
On 7 January 2014 06:26, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> 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.
>> +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.
>> +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.
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2014-02-04 9:55 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-28 0:02 [Buildroot] [PATCH] vlc: New package Ismael Luceno
2013-03-19 10:05 [Buildroot] [PATCH] vlc: new package Alexey Brodkin
2013-04-02 5:08 ` Bernd Kuhls
2013-04-26 7:33 ` Alexey Brodkin
2013-05-06 15:35 ` Alexey Brodkin
2014-02-04 9:40 ` Thomas Petazzoni
2014-02-04 9:55 ` Alexey Brodkin
2013-04-02 16:05 Alexey Brodkin
2014-01-06 22:09 spdawson at gmail.com
2014-01-07 3:39 ` Baruch Siach
2014-01-07 11:17 ` Simon Dawson
2014-01-07 11:51 ` Baruch Siach
2014-01-07 11:52 ` Simon Dawson
2014-01-07 6:26 ` Thomas Petazzoni
2014-01-07 11:20 ` Simon Dawson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.