Browse Source

xap/vlc: Upgraded to vlc-3.0.8.

current-20191101
Damien Goutte-Gattat 2 years ago
parent
commit
2d9187fa1f
  1. 184
      xap/vlc/vlc-2.2.4-ffmpeg3-1.patch
  2. 1
      xap/vlc/vlc-2.2.4.tar.xz.sha256
  3. 13
      xap/vlc/vlc-3.0.8-fix-missing-gles-headers.patch
  4. 1
      xap/vlc/vlc-3.0.8.tar.xz.sha256
  5. 27
      xap/vlc/vlc.SlackBuild

184
xap/vlc/vlc-2.2.4-ffmpeg3-1.patch

@ -1,184 +0,0 @@
Submitted By: Armin K <krejzi au email do com>
Date: 2016-05-06
Initial Package Version: 2.2.3
Upstream Status: Committed
Origin: Upstream
Description: Fixes building against ffmpeg3
Rediffed for version 2.2.3 by Bruce Dubbs
diff -Naur vlc-2.2.3.orig/configure vlc-2.2.3/configure
--- vlc-2.2.3.orig/configure 2016-04-04 19:45:51.000000000 -0500
+++ vlc-2.2.3/configure 2016-05-06 22:39:24.859030920 -0500
@@ -36549,7 +36549,7 @@
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavutil < 55\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavutil < 55") 2>&5
+ ($PKG_CONFIG --exists --print-errors "libavutil > 55") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
@@ -36843,7 +36843,7 @@
ffmpeg)
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 57.10.100\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 57.10.100") 2>&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 60.10.100") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
@@ -36927,7 +36927,7 @@
ffmpeg)
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 57.10.100\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 57.10.100") 2>&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 60.10.100") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
@@ -45119,7 +45119,7 @@
ffmpeg) av_vdpau_ver="55.42.100"
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 57.10.100\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 57.10.100") 2>&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 60.10.100") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
diff -Naur vlc-2.2.3.orig/modules/codec/avcodec/audio.c vlc-2.2.3/modules/codec/avcodec/audio.c
--- vlc-2.2.3.orig/modules/codec/avcodec/audio.c 2015-12-08 10:18:56.000000000 -0600
+++ vlc-2.2.3/modules/codec/avcodec/audio.c 2016-05-06 22:39:24.859030920 -0500
@@ -36,12 +36,11 @@
#include <vlc_codec.h>
#include <vlc_avcodec.h>
+#include "avcodec.h"
+
#include <libavcodec/avcodec.h>
#include <libavutil/mem.h>
-#include <libavutil/audioconvert.h>
-
-#include "avcodec.h"
/*****************************************************************************
* decoder_sys_t : decoder descriptor
diff -Naur vlc-2.2.3.orig/modules/codec/avcodec/avcommon_compat.h vlc-2.2.3/modules/codec/avcodec/avcommon_compat.h
--- vlc-2.2.3.orig/modules/codec/avcodec/avcommon_compat.h 2015-03-01 08:07:35.000000000 -0600
+++ vlc-2.2.3/modules/codec/avcodec/avcommon_compat.h 2016-05-06 22:39:24.859030920 -0500
@@ -506,6 +506,15 @@
#endif /* HAVE_LIBAVUTIL_AVUTIL_H */
+#if LIBAVUTIL_VERSION_MAJOR >= 55
+# define FF_API_AUDIOCONVERT 1
+#endif
+
+/* libavutil/pixfmt.h */
+#ifndef PixelFormat
+# define PixelFormat AVPixelFormat
+#endif
+
#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
# include <libavformat/avformat.h>
diff -Naur vlc-2.2.3.orig/modules/codec/avcodec/encoder.c vlc-2.2.3/modules/codec/avcodec/encoder.c
--- vlc-2.2.3.orig/modules/codec/avcodec/encoder.c 2015-10-21 11:36:45.000000000 -0500
+++ vlc-2.2.3/modules/codec/avcodec/encoder.c 2016-05-06 22:39:24.860030887 -0500
@@ -41,7 +41,6 @@
#include <vlc_cpu.h>
#include <libavcodec/avcodec.h>
-#include <libavutil/audioconvert.h>
#include "avcodec.h"
#include "avcommon.h"
@@ -311,7 +310,7 @@
else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
&psz_namecodec ) )
{
- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
return VLC_EGENERIC; /* handed chroma output */
i_cat = VIDEO_ES;
@@ -1017,7 +1016,7 @@
}
}
- p_sys->frame = avcodec_alloc_frame();
+ p_sys->frame = av_frame_alloc();
if( !p_sys->frame )
{
goto error;
@@ -1088,7 +1087,8 @@
AVFrame *frame = NULL;
if( likely(p_pict) ) {
frame = p_sys->frame;
- avcodec_get_frame_defaults( frame );
+ av_frame_unref( frame );
+
for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
{
p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
@@ -1329,7 +1329,7 @@
//How much we need to copy from new packet
const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
- avcodec_get_frame_defaults( p_sys->frame );
+ av_frame_unref( p_sys->frame );
p_sys->frame->format = p_sys->p_context->sample_fmt;
p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
@@ -1451,7 +1451,8 @@
while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
{
- avcodec_get_frame_defaults( p_sys->frame );
+ av_frame_unref( p_sys->frame );
+
if( p_sys->b_variable )
p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
else
diff -Naur vlc-2.2.3.orig/modules/codec/avcodec/vaapi.c vlc-2.2.3/modules/codec/avcodec/vaapi.c
--- vlc-2.2.3.orig/modules/codec/avcodec/vaapi.c 2014-11-16 12:57:58.000000000 -0600
+++ vlc-2.2.3/modules/codec/avcodec/vaapi.c 2016-05-06 22:39:24.860030887 -0500
@@ -595,7 +595,7 @@
return err;
/* Only VLD supported */
- p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
+ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
p_va->setup = Setup;
p_va->get = Get;
p_va->release = Release;
diff -Naur vlc-2.2.3.orig/modules/codec/avcodec/video.c vlc-2.2.3/modules/codec/avcodec/video.c
--- vlc-2.2.3.orig/modules/codec/avcodec/video.c 2016-04-04 19:45:24.000000000 -0500
+++ vlc-2.2.3/modules/codec/avcodec/video.c 2016-05-06 22:39:24.860030887 -0500
@@ -234,7 +234,7 @@
p_sys->p_codec = p_codec;
p_sys->i_codec_id = i_codec_id;
p_sys->psz_namecodec = psz_namecodec;
- p_sys->p_ff_pic = avcodec_alloc_frame();
+ p_sys->p_ff_pic = av_frame_alloc();
p_sys->b_delayed_open = true;
p_sys->p_va = NULL;
vlc_sem_init( &p_sys->sem_mt, 0 );
@@ -446,7 +446,7 @@
if( ffmpeg_OpenCodec( p_dec ) < 0 )
{
msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
- avcodec_free_frame( &p_sys->p_ff_pic );
+ av_frame_free( &p_sys->p_ff_pic );
vlc_sem_destroy( &p_sys->sem_mt );
free( p_sys );
return VLC_EGENERIC;
@@ -826,7 +826,7 @@
wait_mt( p_sys );
if( p_sys->p_ff_pic )
- avcodec_free_frame( &p_sys->p_ff_pic );
+ av_frame_free( &p_sys->p_ff_pic );
if( p_sys->p_va )
vlc_va_Delete( p_sys->p_va );

1
xap/vlc/vlc-2.2.4.tar.xz.sha256

@ -1 +0,0 @@
1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be vlc-2.2.4.tar.xz

13
xap/vlc/vlc-3.0.8-fix-missing-gles-headers.patch

@ -0,0 +1,13 @@
diff -Naur vlc-3.0.8/modules/video_output/opengl/converter_vaapi.c vlc-3.0.8.p/modules/video_output/opengl/converter_vaapi.c
--- vlc-3.0.8/modules/video_output/opengl/converter_vaapi.c 2018-10-28 11:11:19.000000000 +0000
+++ vlc-3.0.8.p/modules/video_output/opengl/converter_vaapi.c 2019-12-02 20:44:08.227596085 +0000
@@ -47,6 +47,9 @@
# include <fcntl.h>
#endif
+#include <GLES/glplatform.h>
+#include <GLES/glext.h>
+
struct priv
{
struct vlc_vaapi_instance *vainst;

1
xap/vlc/vlc-3.0.8.tar.xz.sha256

@ -0,0 +1 @@
e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6 vlc-3.0.8.tar.xz

27
xap/vlc/vlc.SlackBuild

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2013,2015-2017 Damien Goutte-Gattat
# Copyright (C) 2013,2015-2017,2019 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -22,20 +22,20 @@
#
# Contact: Damien Goutte-Gattat <dgouttegattat@incenp.org>
#
# Latest vlc sourcecode is available at: <http://www.videolan.org/>.
# Latest vlc sourcecode is available at: <https://www.videolan.org/>.
#
# Depends: xap/ffmpeg
# Recommends: l/liba52
# Recommends: l/libmatroska, l/qt5
# Optional: ap/jack, d/lua
# Source package infos
NAMESRC=${NAMESRC:-vlc}
VERSION=${VERSION:-2.2.4}
VERSION=${VERSION:-3.0.8}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.xz}
WGET=${WGET:-http://download.videolan.org/pub/videolan/vlc/$VERSION/$ARCHIVE}
WGET=${WGET:-https://download.videolan.org/pub/videolan/vlc/$VERSION/$ARCHIVE}
# Build infos
NAMEPKG=${NAMEPKG:-vlc}
BUILD=${BUILD:-2GGD}
BUILD=${BUILD:-1GGD}
ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
JOBS=${JOBS:-1}
EXT=${EXT:-txz}
@ -86,8 +86,7 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Patch for FFmpeg > 3
patch -p1 < $CWD/vlc-2.2.4-ffmpeg3-1.patch
patch -p1 < $CWD/vlc-3.0.8-fix-missing-gles-headers.patch
CFLAGS=$CPUOPT \
CXXFLAGS=$CPUOPT \
./configure \
@ -97,6 +96,7 @@ CXXFLAGS=$CPUOPT \
--docdir=/usr/doc/$NAME \
--with-gnu-ld \
--disable-lua \
--disable-jack \
--disable-dependency-tracking \
--build=$ARCH-slackware-linux
make -j $JOBS
@ -105,10 +105,11 @@ make install-strip DESTDIR=$PKG
# Compress man pages
find $PKG/usr/man -type f -exec gzip -9 {} \;
# Install the documentation
mkdir -p $PKG/usr/doc/$NAME
# Install the documentation...
install -m 644 AUTHORS COPYING{,.LIB} ChangeLog NEWS README THANKS \
$PKG/usr/doc/$NAME
# ... and remove whatever "documentation" the build system put there
rm -rf $PKG/usr/doc/$NAME/fortunes.txt libvlc
# Copy slack-desc and doinst.sh files
install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc
@ -116,8 +117,8 @@ install -m 755 $CWD/doinst.sh $PKG/install/doinst.sh
# Add dependency infos
cat <<EOF > $PKG/install/slack-required
ffmpeg
liba52
libmatroska
qt5
EOF
# Package the tree

Loading…
Cancel
Save