[arch-commits] Commit in libopenshot/trunk (PKGBUILD libopenshot-ffmpeg3.patch)

[Antonio Rojas]

    Date: Friday, May 13, 2016 @ 21:55:45
  Author: arojas
Revision: 175235

Update to 0.1.1

Modified:
  libopenshot/trunk/PKGBUILD
Deleted:
  libopenshot/trunk/libopenshot-ffmpeg3.patch

---------------------------+
 PKGBUILD                  |   20 +++------
 libopenshot-ffmpeg3.patch |   96 --------------------------------------------
 2 files changed, 7 insertions(+), 109 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-13 19:49:42 UTC (rev 175234)
+++ PKGBUILD	2016-05-13 19:55:45 UTC (rev 175235)
@@ -4,8 +4,8 @@
 # Contributor: Jonathan Thomas <jonathan at openshot.org>
 
 pkgname=libopenshot
-pkgver=0.0.6
-pkgrel=4
+pkgver=0.1.1
+pkgrel=1
 pkgdesc="A high quality, open-source video editing, animation, and playback library for C++, Python, and Ruby."
 arch=('i686' 'x86_64')
 url="http://openshot.org/"
@@ -12,18 +12,11 @@
 license=('LGPL3')
 depends=('imagemagick' 'ffmpeg' 'libx264' 'libopenshot-audio' 'python' 'qt5-base' 'qt5-multimedia' 'ruby')
 makedepends=('cmake' 'doxygen' 'swig' 'unittestpp')
-source=("https://launchpad.net/libopenshot/0.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" libopenshot-ffmpeg3.patch)
-sha256sums=('8b1009b146ae5fab50a784534f32ef796cf5b4e59617dde7633fa5995e4ef0f9'
-            '2d9d6a881944b6a04da90e89561996eeb46fb62183d12f86e529d29f0cd8be65')
+source=("https://launchpad.net/libopenshot/0.1/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('7f79084b0fda085ee5740f4907a2ac4bd736de6b3c4958b4441f49eaedfc7eee')
 
-prepare() {
-  cd $pkgname-$pkgver
-# Fix build with ffmpeg 3.0
-  patch -p1 -i ../libopenshot-ffmpeg3.patch
-}
-
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+#	cd ${pkgname}-${pkgver}
 	mkdir build
 	cd build
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 ../
@@ -31,7 +24,8 @@
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}/build"
+#	cd ${pkgname}-${pkgver}
+        cd build
 	make DESTDIR="${pkgdir}" install
 }
 

Deleted: libopenshot-ffmpeg3.patch
===================================================================
--- libopenshot-ffmpeg3.patch	2016-05-13 19:49:42 UTC (rev 175234)
+++ libopenshot-ffmpeg3.patch	2016-05-13 19:55:45 UTC (rev 175235)
@@ -1,96 +0,0 @@
-From bb6102f46f80030c7149107d147f00dfc5ea563e Mon Sep 17 00:00:00 2001
-From: Jonathan Thomas <jonathan at openshot.org>
-Date: Thu, 7 Jan 2016 23:50:48 -0600
-Subject: [PATCH] Added support for newer versions of libav media library.
-
----
- cmake/Modules/FindFFmpeg.cmake | 12 ++++++------
- include/FFmpegUtilities.h      | 17 +++++++++++++++++
- 2 files changed, 23 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/Modules/FindFFmpeg.cmake b/cmake/Modules/FindFFmpeg.cmake
-index 36ad9e0..4af6cc9 100644
---- a/cmake/Modules/FindFFmpeg.cmake
-+++ b/cmake/Modules/FindFFmpeg.cmake
-@@ -14,7 +14,7 @@ FIND_PATH( AVFORMAT_INCLUDE_DIR libavformat/avformat.h
- 		   	$ENV{FFMPEGDIR}/include/
- 		   	$ENV{FFMPEGDIR}/include/ffmpeg/ )
- 
--FIND_LIBRARY( AVFORMAT_LIBRARY avformat avformat-55
-+FIND_LIBRARY( AVFORMAT_LIBRARY avformat avformat-55 avformat-57
- 		   PATHS /usr/lib/
- 		   	 /usr/lib/ffmpeg/
- 		   	 $ENV{FFMPEGDIR}/lib/
-@@ -28,7 +28,7 @@ FIND_PATH( AVCODEC_INCLUDE_DIR libavcodec/avcodec.h
- 		   	 $ENV{FFMPEGDIR}/include/
- 		   	 $ENV{FFMPEGDIR}/include/ffmpeg/ )
- 
--FIND_LIBRARY( AVCODEC_LIBRARY avcodec avcodec-55
-+FIND_LIBRARY( AVCODEC_LIBRARY avcodec avcodec-55 avcodec-57
- 		   PATHS /usr/lib/
- 		   	 /usr/lib/ffmpeg/
- 		   	 $ENV{FFMPEGDIR}/lib/
-@@ -42,7 +42,7 @@ FIND_PATH( AVUTIL_INCLUDE_DIR libavutil/avutil.h
- 		   	 $ENV{FFMPEGDIR}/include/
- 		   	 $ENV{FFMPEGDIR}/include/ffmpeg/ )
- 
--FIND_LIBRARY( AVUTIL_LIBRARY avutil avutil-52
-+FIND_LIBRARY( AVUTIL_LIBRARY avutil avutil-52 avutil-55
- 		   PATHS /usr/lib/
- 		   	 /usr/lib/ffmpeg/
- 		   	 $ENV{FFMPEGDIR}/lib/
-@@ -56,7 +56,7 @@ FIND_PATH( AVDEVICE_INCLUDE_DIR libavdevice/avdevice.h
- 		   	 $ENV{FFMPEGDIR}/include/
- 		   	 $ENV{FFMPEGDIR}/include/ffmpeg/ )
- 
--FIND_LIBRARY( AVDEVICE_LIBRARY avdevice avdevice-55
-+FIND_LIBRARY( AVDEVICE_LIBRARY avdevice avdevice-55 avdevice-56
- 		   PATHS /usr/lib/
- 		   	 /usr/lib/ffmpeg/
- 		   	 $ENV{FFMPEGDIR}/lib/
-@@ -70,7 +70,7 @@ FIND_PATH( SWSCALE_INCLUDE_DIR libswscale/swscale.h
- 		   	 $ENV{FFMPEGDIR}/include/
- 		   	 $ENV{FFMPEGDIR}/include/ffmpeg/ )
- 
--FIND_LIBRARY( SWSCALE_LIBRARY swscale swscale-2
-+FIND_LIBRARY( SWSCALE_LIBRARY swscale swscale-2 swscale-4
- 		   PATHS /usr/lib/
- 		   	 /usr/lib/ffmpeg/
- 		   	 $ENV{FFMPEGDIR}/lib/
-@@ -84,7 +84,7 @@ FIND_PATH( AVRESAMPLE_INCLUDE_DIR libavresample/avresample.h
- 		   	 $ENV{FFMPEGDIR}/include/
- 		   	 $ENV{FFMPEGDIR}/include/ffmpeg/ )
- 
--FIND_LIBRARY( AVRESAMPLE_LIBRARY avresample avresample-2
-+FIND_LIBRARY( AVRESAMPLE_LIBRARY avresample avresample-2 avresample-3
- 		   PATHS /usr/lib/
- 		   	 /usr/lib/ffmpeg/
- 		   	 $ENV{FFMPEGDIR}/lib/
-diff --git a/include/FFmpegUtilities.h b/include/FFmpegUtilities.h
-index d90c37c..40000b7 100644
---- a/include/FFmpegUtilities.h
-+++ b/include/FFmpegUtilities.h
-@@ -81,6 +81,23 @@
- 	#undef av_err2str
- 	#define av_err2str(errnum) av_make_error_string(errnum).c_str()
- 
-+	// Define this for compatibility
-+	#ifndef PixelFormat
-+		#define PixelFormat AVPixelFormat
-+    #endif
-+	#ifndef PIX_FMT_RGBA
-+		#define PIX_FMT_RGBA AV_PIX_FMT_RGBA
-+    #endif
-+	#ifndef PIX_FMT_NONE
-+		#define PIX_FMT_NONE AV_PIX_FMT_NONE
-+    #endif
-+	#ifndef PIX_FMT_RGB24
-+		#define PIX_FMT_RGB24 AV_PIX_FMT_RGB24
-+	#endif
-+	#ifndef PIX_FMT_YUV420P
-+		#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
-+	#endif
-+
- 	#if LIBAVFORMAT_VERSION_MAJOR >= 55
- 		#define AV_ALLOCATE_FRAME() av_frame_alloc()
- 		#define AV_RESET_FRAME(av_frame) av_frame_unref(av_frame)