2014-08-03 15:44:04 +02:00
|
|
|
diff -uNr vlc-2.1.5.org/bin/Makefile.am vlc-2.1.5/bin/Makefile.am
|
|
|
|
--- vlc-2.1.5.org/bin/Makefile.am 2013-12-03 10:12:34.000000000 +0100
|
|
|
|
+++ vlc-2.1.5/bin/Makefile.am 2014-08-03 12:30:06.722154518 +0200
|
|
|
|
@@ -1,7 +1,7 @@
|
|
|
|
# Building vlc
|
|
|
|
#
|
|
|
|
bin_PROGRAMS = vlc
|
|
|
|
-noinst_PROGRAMS = vlc-static
|
|
|
|
+noinst_PROGRAMS =
|
|
|
|
noinst_DATA =
|
|
|
|
vlclib_PROGRAMS = vlc-cache-gen
|
|
|
|
EXTRA_PROGRAMS = vlc-wrapper
|
|
|
|
diff -uNr vlc-2.1.5.org/Makefile.am vlc-2.1.5/Makefile.am
|
|
|
|
--- vlc-2.1.5.org/Makefile.am 2014-02-14 18:40:50.000000000 +0100
|
|
|
|
+++ vlc-2.1.5/Makefile.am 2014-08-03 12:29:52.059010766 +0200
|
package/vlc: bump to 2.2.0
Since we bumped FreeRDP, vlc no longer builds:
http://autobuild.buildroot.org/results/8d9/8d91e3ffccee753135e9d0faa2b1ae00875606c9/
http://autobuild.buildroot.org/results/e1f/e1f6526d1a4ac2c95998793efea2188faa708e29/
Fix that by bumping vlc to 2.2.0, as vlc-2.1.6will never support this
new version of FreeRDP.
Add dependency on kernel headers >= 3.7, because it needs DTV_STREAM_ID.
I stumbled on this whith a toolchain using headers forom 3.5, but only
tested with a toolchain with headers from 3.9, so there might be other
dependencies I missed on 3.8 or even 3.9. Let's wait for build failures
to find out...
There are quite a bunch of new --enable/disable options, so I've tried
to catter for all the changes. Most notably, there's no longer a flag to
enable.disable GL, it is now always auto-detected. Also, I've added
flags for GLES which we were missing so far, so we had to rely on the
build order to detect those dependencies (which was OK becasue libgles
sorts before vlc). Finally, SVG now has two flags to enable different
parts of SVG support, but they both depend on the same library, so
enable both.
There are new support for some features, like acceleration on RPI, but
that can well wait for further patches when someone is interested ;-) ,
vdpau HW accelearation on NVidia (we have a package for that, but not
able to test, so not added), vpx support (we have a libvpx package,
but I had no time to test), x262 and x265 support for which we're
currently lacking the packaging, and a few other exotic stuff...
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-04 23:15:34 +01:00
|
|
|
@@ -932,7 +932,7 @@
|
2014-08-03 15:44:04 +02:00
|
|
|
cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
|
|
|
|
|
|
|
|
core: libvlc vlc$(EXEEXT)
|
|
|
|
- cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
|
|
|
|
+ cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
|
|
|
|
|
|
|
|
doc:
|
|
|
|
cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
|