summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Choina2018-06-20 22:53:34 -0400
committerSolomon Choina2018-06-20 22:53:34 -0400
commit220ae86ae5ae26f34659c309af5faefcd91daafa (patch)
tree06fde93ec99481305fed0e24b2c0357442c9ff90
parentf36ecfc1da960ecf487bb2277a2ba7d25f594f71 (diff)
downloadaur-220ae86ae5ae26f34659c309af5faefcd91daafa.tar.gz
updated pkgver remove patche
-rw-r--r--.SRCINFO8
-rw-r--r--0002-Fix-compatibility-with-OpenCV-3.4.1.patch75
-rw-r--r--PKGBUILD11
-rw-r--r--video_filter_opencv_Fix_compilation.patch229
4 files changed, 7 insertions, 316 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f0b78697351..8b48c16541e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = vlc-nightly
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player - nightly snapshot
- pkgver = 4.0.0v20180617
+ pkgver = 4.0.0v20180620
pkgrel = 1
url = https://www.videolan.org/vlc/
arch = x86_64
@@ -170,15 +170,13 @@ pkgbase = vlc-nightly
conflicts = vlc
replaces = vlc-plugin
options = !emptydirs
- source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20180617-0244-dev.tar.xz
+ source = http://nightlies.videolan.org/build/source/vlc-4.0.0-20180620-0241-dev.tar.xz
source = update-vlc-plugin-cache.hook
source = 0001-lua-fix-build-using-lua-5.3.patch
- source = 0002-Fix-compatibility-with-OpenCV-3.4.1.patch
source = find-deps.py
- sha256sums = ac3d8962caf6dc2779fdcee950fff6af0a638cade4e140698fa567c927986599
+ sha256sums = 1a2a77fe67f71b9ff8cd4ec9022e62e2b454a6e30cf6e26e9bb3729ba1a63f57
sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a
sha256sums = 75ad8802bad1a79754e40fd107f5a6922c54f7467dadef8b439b49d410c8f7d2
- sha256sums = 4e5c7582b2c1090e598710a6afa6062348f4e87b3909c3d9f12f12e08e0eea6c
sha256sums = 90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7
pkgname = vlc-nightly
diff --git a/0002-Fix-compatibility-with-OpenCV-3.4.1.patch b/0002-Fix-compatibility-with-OpenCV-3.4.1.patch
deleted file mode 100644
index d44a4fa940c..00000000000
--- a/0002-Fix-compatibility-with-OpenCV-3.4.1.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 5897545a4149c68e3996cfbe1e13894f03aaa307 Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 11 Mar 2018 20:23:42 +0100
-Subject: [PATCH 2/2] Fix compatibility with OpenCV 3.4.1
-
----
- modules/video_filter/Makefile.am | 2 +-
- modules/video_filter/{opencv_wrapper.c => opencv_wrapper.cpp} | 6 +++---
- po/POTFILES.in | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
- rename modules/video_filter/{opencv_wrapper.c => opencv_wrapper.cpp} (98%)
-
-diff --git a/modules/video_filter/Makefile.am b/modules/video_filter/Makefile.am
-index af190d16e3..d1703a7ed3 100644
---- a/modules/video_filter/Makefile.am
-+++ b/modules/video_filter/Makefile.am
-@@ -147,7 +147,7 @@ endif
- libdeinterlace_plugin_la_LIBADD = libdeinterlace_common.la
- video_filter_LTLIBRARIES += libdeinterlace_plugin.la
-
--libopencv_wrapper_plugin_la_SOURCES = video_filter/opencv_wrapper.c
-+libopencv_wrapper_plugin_la_SOURCES = video_filter/opencv_wrapper.cpp
- libopencv_wrapper_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
- libopencv_wrapper_plugin_la_LIBADD = $(OPENCV_LIBS)
- libopencv_wrapper_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
-diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.cpp
-similarity index 98%
-rename from modules/video_filter/opencv_wrapper.c
-rename to modules/video_filter/opencv_wrapper.cpp
-index 525e55db1b..1e4f19c871 100644
---- a/modules/video_filter/opencv_wrapper.c
-+++ b/modules/video_filter/opencv_wrapper.cpp
-@@ -154,7 +154,7 @@ static int Create( vlc_object_t *p_this )
- char *psz_chroma, *psz_output;
-
- /* Allocate structure */
-- p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
-+ p_filter->p_sys = reinterpret_cast<filter_sys_t*>( malloc( sizeof( filter_sys_t ) ) );
- if( p_filter->p_sys == NULL )
- return VLC_ENOMEM;
-
-@@ -167,7 +167,7 @@ static int Create( vlc_object_t *p_this )
- * We don't need to set up video formats for this filter as it not
- * actually using a picture_t.
- */
-- p_filter->p_sys->p_opencv = vlc_object_create( p_filter, sizeof(filter_t) );
-+ p_filter->p_sys->p_opencv = reinterpret_cast<filter_t*>( vlc_object_create( p_filter, sizeof(filter_t) ) );
- if( !p_filter->p_sys->p_opencv ) {
- free( p_filter->p_sys );
- return VLC_ENOMEM;
-@@ -315,7 +315,7 @@ static void VlcPictureToIplImage( filter_t* p_filter, picture_t* p_in )
- {
- int planes = p_in->i_planes; //num input video planes
- // input video size
-- CvSize sz = cvSize(abs(p_in->format.i_width), abs(p_in->format.i_height));
-+ CvSize sz = cvSize(abs(static_cast<int>(p_in->format.i_width)), abs(static_cast<int>(p_in->format.i_height)));
- video_format_t fmt_out;
- filter_sys_t* p_sys = p_filter->p_sys;
-
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 528249a98c..78d2128373 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -1145,7 +1145,7 @@ modules/video_filter/motionblur.c
- modules/video_filter/motiondetect.c
- modules/video_filter/oldmovie.c
- modules/video_filter/opencv_example.cpp
--modules/video_filter/opencv_wrapper.c
-+modules/video_filter/opencv_wrapper.cpp
- modules/video_filter/posterize.c
- modules/video_filter/postproc.c
- modules/video_filter/psychedelic.c
---
-2.16.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 9b477fcbccd..1f81397b04d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,10 @@
_appname_=vlc
pkgname=${_appname_}-nightly
-pkgver=4.0.0v20180617
+pkgver=4.0.0v20180620
_pkgver=4.0.0
-_snapshot_=20180617
-_snapver_=0244
+_snapshot_=20180620
+_snapver_=0241
_suffix_=dev
_nightly_=${_snapshot_}-${_snapver_}
pkgrel=1
@@ -109,7 +109,6 @@ options=('!emptydirs')
source=("http://nightlies.videolan.org/build/source/vlc-${_pkgver}-${_nightly_}-${_suffix_}.tar.xz"
'update-vlc-plugin-cache.hook'
'0001-lua-fix-build-using-lua-5.3.patch'
- '0002-Fix-compatibility-with-OpenCV-3.4.1.patch'
'find-deps.py')
pkgver() {
@@ -122,7 +121,6 @@ prepare() {
./bootstrap
patch -Np1 -i "${srcdir}/0001-lua-fix-build-using-lua-5.3.patch"
- #patch -Np1 -i "${srcdir}/0002-Fix-compatibility-with-OpenCV-3.4.1.patch"
sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype/freetype.c
sed 's|whoami|echo builduser|g' -i configure
@@ -256,8 +254,7 @@ package() {
# depends=("${_detected_depends[@]}" "${_undetected_depends[@]}")
}
-sha256sums=('ac3d8962caf6dc2779fdcee950fff6af0a638cade4e140698fa567c927986599'
+sha256sums=('1a2a77fe67f71b9ff8cd4ec9022e62e2b454a6e30cf6e26e9bb3729ba1a63f57'
'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
'75ad8802bad1a79754e40fd107f5a6922c54f7467dadef8b439b49d410c8f7d2'
- '4e5c7582b2c1090e598710a6afa6062348f4e87b3909c3d9f12f12e08e0eea6c'
'90b0e34d5772d2307ba07a1c2aa715db7488389003cfe6d3570b2a9c63061db7')
diff --git a/video_filter_opencv_Fix_compilation.patch b/video_filter_opencv_Fix_compilation.patch
deleted file mode 100644
index 0f3e9934dda..00000000000
--- a/video_filter_opencv_Fix_compilation.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-
- modules/video_filter/opencv_wrapper.c | 108 +++++++++++++-------------
- 1 file changed, 56 insertions(+), 52 deletions(-)
-
-diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
-index ed48fe1f67..6560502fa6 100644
---- a/modules/video_filter/opencv_wrapper.c
-+++ b/modules/video_filter/opencv_wrapper.c
-@@ -158,6 +158,8 @@ static int Create( vlc_object_t *p_this )
- if( p_filter-&gt;p_sys == NULL )
- return VLC_ENOMEM;
-
-+ filter_sys_t *p_sys = p_filter-&gt;p_sys;
-+
- /* Load the internal OpenCV filter.
- *
- * This filter object is needed to call the internal OpenCV filter
-@@ -167,39 +169,39 @@ static int Create( vlc_object_t *p_this )
- * We don't need to set up video formats for this filter as it not
- * actually using a picture_t.
- */
-- p_filter-&gt;p_sys-&gt;p_opencv = vlc_object_create( p_filter, sizeof(filter_t) );
-- if( !p_filter-&gt;p_sys-&gt;p_opencv ) {
-- free( p_filter-&gt;p_sys );
-+ p_sys-&gt;p_opencv = vlc_object_create( p_filter, sizeof(filter_t) );
-+ if( !p_sys-&gt;p_opencv ) {
-+ free( p_sys );
- return VLC_ENOMEM;
- }
-
-- p_filter-&gt;p_sys-&gt;psz_inner_name = var_InheritString( p_filter, "opencv-filter-name" );
-- if( p_filter-&gt;p_sys-&gt;psz_inner_name )
-- p_filter-&gt;p_sys-&gt;p_opencv-&gt;p_module =
-- module_need( p_filter-&gt;p_sys-&gt;p_opencv,
-+ p_sys-&gt;psz_inner_name = var_InheritString( p_filter, "opencv-filter-name" );
-+ if( p_sys-&gt;psz_inner_name )
-+ p_sys-&gt;p_opencv-&gt;p_module =
-+ module_need( p_sys-&gt;p_opencv,
- "opencv internal filter",
-- p_filter-&gt;p_sys-&gt;psz_inner_name,
-+ p_sys-&gt;psz_inner_name,
- true );
-
-- if( !p_filter-&gt;p_sys-&gt;p_opencv-&gt;p_module )
-+ if( !p_sys-&gt;p_opencv-&gt;p_module )
- {
-- msg_Err( p_filter, "can't open internal opencv filter: %s", p_filter-&gt;p_sys-&gt;psz_inner_name );
-- free( p_filter-&gt;p_sys-&gt;psz_inner_name );
-- p_filter-&gt;p_sys-&gt;psz_inner_name = NULL;
-- vlc_object_release( p_filter-&gt;p_sys-&gt;p_opencv );
-- free( p_filter-&gt;p_sys );
-+ msg_Err( p_filter, "can't open internal opencv filter: %s", p_sys-&gt;psz_inner_name );
-+ free( p_sys-&gt;psz_inner_name );
-+ p_sys-&gt;psz_inner_name = NULL;
-+ vlc_object_release( p_sys-&gt;p_opencv );
-+ free( p_sys );
-
- return VLC_ENOMOD;
- }
-
-
- /* Init structure */
-- p_filter-&gt;p_sys-&gt;p_image = image_HandlerCreate( p_filter );
-+ p_sys-&gt;p_image = image_HandlerCreate( p_filter );
- for( int i = 0; i &lt; VOUT_MAX_PLANES; i++ )
-- p_filter-&gt;p_sys-&gt;p_cv_image[i] = NULL;
-- p_filter-&gt;p_sys-&gt;p_proc_image = NULL;
-- p_filter-&gt;p_sys-&gt;p_to_be_freed = NULL;
-- p_filter-&gt;p_sys-&gt;i_cv_image_size = 0;
-+ p_sys-&gt;p_cv_image[i] = NULL;
-+ p_sys-&gt;p_proc_image = NULL;
-+ p_sys-&gt;p_to_be_freed = NULL;
-+ p_sys-&gt;i_cv_image_size = 0;
-
- /* Retrieve and apply config */
- psz_chroma = var_InheritString( p_filter, "opencv-chroma" );
-@@ -207,16 +209,16 @@ static int Create( vlc_object_t *p_this )
- {
- msg_Err( p_filter, "configuration variable %s empty, using 'grey'",
- "opencv-chroma" );
-- p_filter-&gt;p_sys-&gt;i_internal_chroma = GREY;
-+ p_sys-&gt;i_internal_chroma = GREY;
- } else if( !strcmp( psz_chroma, "input" ) )
-- p_filter-&gt;p_sys-&gt;i_internal_chroma = CINPUT;
-+ p_sys-&gt;i_internal_chroma = CINPUT;
- else if( !strcmp( psz_chroma, "I420" ) )
-- p_filter-&gt;p_sys-&gt;i_internal_chroma = GREY;
-+ p_sys-&gt;i_internal_chroma = GREY;
- else if( !strcmp( psz_chroma, "RGB32" ) )
-- p_filter-&gt;p_sys-&gt;i_internal_chroma = RGB;
-+ p_sys-&gt;i_internal_chroma = RGB;
- else {
- msg_Err( p_filter, "no valid opencv-chroma provided, using 'grey'" );
-- p_filter-&gt;p_sys-&gt;i_internal_chroma = GREY;
-+ p_sys-&gt;i_internal_chroma = GREY;
- }
-
- free( psz_chroma );
-@@ -226,28 +228,28 @@ static int Create( vlc_object_t *p_this )
- {
- msg_Err( p_filter, "configuration variable %s empty, using 'input'",
- "opencv-output" );
-- p_filter-&gt;p_sys-&gt;i_wrapper_output = VINPUT;
-+ p_sys-&gt;i_wrapper_output = VINPUT;
- } else if( !strcmp( psz_output, "none" ) )
-- p_filter-&gt;p_sys-&gt;i_wrapper_output = NONE;
-+ p_sys-&gt;i_wrapper_output = NONE;
- else if( !strcmp( psz_output, "input" ) )
-- p_filter-&gt;p_sys-&gt;i_wrapper_output = VINPUT;
-+ p_sys-&gt;i_wrapper_output = VINPUT;
- else if( !strcmp( psz_output, "processed" ) )
-- p_filter-&gt;p_sys-&gt;i_wrapper_output = PROCESSED;
-+ p_sys-&gt;i_wrapper_output = PROCESSED;
- else {
- msg_Err( p_filter, "no valid opencv-output provided, using 'input'" );
-- p_filter-&gt;p_sys-&gt;i_wrapper_output = VINPUT;
-+ p_sys-&gt;i_wrapper_output = VINPUT;
- }
- free( psz_output );
-
-- p_filter-&gt;p_sys-&gt;f_scale =
-+ p_sys-&gt;f_scale =
- var_InheritFloat( p_filter, "opencv-scale" );
-
- msg_Info(p_filter, "Configuration: opencv-scale: %f, opencv-chroma: %d, "
- "opencv-output: %d, opencv-filter %s",
-- p_filter-&gt;p_sys-&gt;f_scale,
-- p_filter-&gt;p_sys-&gt;i_internal_chroma,
-- p_filter-&gt;p_sys-&gt;i_wrapper_output,
-- p_filter-&gt;p_sys-&gt;psz_inner_name);
-+ p_sys-&gt;f_scale,
-+ p_sys-&gt;i_internal_chroma,
-+ p_sys-&gt;i_wrapper_output,
-+ p_sys-&gt;psz_inner_name);
-
- #ifndef NDEBUG
- msg_Dbg( p_filter, "opencv_wrapper successfully started" );
-@@ -266,14 +268,15 @@ static int Create( vlc_object_t *p_this )
- static void Destroy( vlc_object_t *p_this )
- {
- filter_t* p_filter = (filter_t*)p_this;
-+ filter_sys_t* p_sys = p_filter-&gt;p_sys;
- ReleaseImages( p_filter );
-
- // Release the internal OpenCV filter.
-- module_unneed( p_filter-&gt;p_sys-&gt;p_opencv, p_filter-&gt;p_sys-&gt;p_opencv-&gt;p_module );
-- vlc_object_release( p_filter-&gt;p_sys-&gt;p_opencv );
-- p_filter-&gt;p_sys-&gt;p_opencv = NULL;
-+ module_unneed( p_sys-&gt;p_opencv, p_sys-&gt;p_opencv-&gt;p_module );
-+ vlc_object_release( p_sys-&gt;p_opencv );
-+ p_sys-&gt;p_opencv = NULL;
-
-- free( p_filter-&gt;p_sys );
-+ free( p_sys );
- }
-
- /*****************************************************************************
-@@ -403,6 +406,7 @@ static void VlcPictureToIplImage( filter_t* p_filter, picture_t* p_in )
- *****************************************************************************/
- static picture_t* Filter( filter_t* p_filter, picture_t* p_pic )
- {
-+ filter_sys_t* p_sys = p_filter-&gt;p_sys;
- picture_t* p_outpic = filter_NewPicture( p_filter );
- if( p_outpic == NULL ) {
- msg_Err( p_filter, "couldn't get a p_outpic!" );
-@@ -413,20 +417,20 @@ static picture_t* Filter( filter_t* p_filter, picture_t* p_pic )
- video_format_t fmt_out;
-
- // Make a copy if we want to show the original input
-- if (p_filter-&gt;p_sys-&gt;i_wrapper_output == VINPUT)
-+ if (p_sys-&gt;i_wrapper_output == VINPUT)
- picture_Copy( p_outpic, p_pic );
-
- VlcPictureToIplImage( p_filter, p_pic );
- // Pass the image (as a pointer to the first IplImage*) to the
- // internal OpenCV filter for processing.
-- p_filter-&gt;p_sys-&gt;p_opencv-&gt;pf_video_filter( p_filter-&gt;p_sys-&gt;p_opencv, (picture_t*)&amp;(p_filter-&gt;p_sys-&gt;p_cv_image[0]) );
-+ p_sys-&gt;p_opencv-&gt;pf_video_filter( p_sys-&gt;p_opencv, (picture_t*)&amp;(p_sys-&gt;p_cv_image[0]) );
-
-- if(p_filter-&gt;p_sys-&gt;i_wrapper_output == PROCESSED) {
-+ if(p_sys-&gt;i_wrapper_output == PROCESSED) {
- // Processed video
-- if( (p_filter-&gt;p_sys-&gt;p_proc_image) &amp;&amp;
-- (p_filter-&gt;p_sys-&gt;p_proc_image-&gt;i_planes &gt; 0) &amp;&amp;
-- (p_filter-&gt;p_sys-&gt;i_internal_chroma != CINPUT) ) {
-- //p_filter-&gt;p_sys-&gt;p_proc_image-&gt;format.i_chroma = VLC_CODEC_RGB24;
-+ if( (p_sys-&gt;p_proc_image) &amp;&amp;
-+ (p_sys-&gt;p_proc_image-&gt;i_planes &gt; 0) &amp;&amp;
-+ (p_sys-&gt;i_internal_chroma != CINPUT) ) {
-+ //p_sys-&gt;p_proc_image-&gt;format.i_chroma = VLC_CODEC_RGB24;
-
- memset( &amp;fmt_out, 0, sizeof(video_format_t) );
- fmt_out = p_pic-&gt;format;
-@@ -438,16 +442,16 @@ static picture_t* Filter( filter_t* p_filter, picture_t* p_pic )
- * main video output error: pictures leaked, trying to workaround
- */
- picture_t* p_outpic_tmp = image_Convert(
-- p_filter-&gt;p_sys-&gt;p_image,
-- p_filter-&gt;p_sys-&gt;p_proc_image,
-- &amp;(p_filter-&gt;p_sys-&gt;p_proc_image-&gt;format),
-+ p_sys-&gt;p_image,
-+ p_sys-&gt;p_proc_image,
-+ &amp;(p_sys-&gt;p_proc_image-&gt;format),
- &amp;fmt_out );
-
- picture_CopyPixels( p_outpic, p_outpic_tmp );
- CopyInfoAndRelease( p_outpic, p_outpic_tmp );
-- } else if( p_filter-&gt;p_sys-&gt;i_internal_chroma == CINPUT ) {
-- picture_CopyPixels( p_outpic, p_filter-&gt;p_sys-&gt;p_proc_image );
-- picture_CopyProperties( p_outpic, p_filter-&gt;p_sys-&gt;p_proc_image );
-+ } else if( p_sys-&gt;i_internal_chroma == CINPUT ) {
-+ picture_CopyPixels( p_outpic, p_sys-&gt;p_proc_image );
-+ picture_CopyProperties( p_outpic, p_sys-&gt;p_proc_image );
- }
- }
-
-@@ -458,7 +462,7 @@ static picture_t* Filter( filter_t* p_filter, picture_t* p_pic )
- msg_Dbg( p_filter, "Filter() done" );
- #endif
-
-- if( p_filter-&gt;p_sys-&gt;i_wrapper_output != NONE ) {
-+ if( p_sys-&gt;i_wrapper_output != NONE ) {
- return p_outpic;
- } else { // NONE
- picture_Release( p_outpic );
---
-2.17.0
-
-