[arch-commits] Commit in gpac/trunk (3 files)

[Maxime Gauduin]

    Date: Tuesday, July 21, 2020 @ 11:21:34
  Author: alucryd
Revision: 664714

upgpkg: gpac 1:1.0.0-1

Modified:
  gpac/trunk/PKGBUILD
Deleted:
  gpac/trunk/gpac-ffmpeg-4.0.patch
  gpac/trunk/gpac-openssl-1.1.patch

------------------------+
 PKGBUILD               |   59 +++++++++++++++++++++++------------------------
 gpac-ffmpeg-4.0.patch  |   42 ---------------------------------
 gpac-openssl-1.1.patch |   11 --------
 3 files changed, 30 insertions(+), 82 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-21 11:21:27 UTC (rev 664713)
+++ PKGBUILD	2020-07-21 11:21:34 UTC (rev 664714)
@@ -2,8 +2,8 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=gpac
-pkgver=0.8.0
-pkgrel=2
+pkgver=1.0.0
+pkgrel=1
 epoch=1
 pkgdesc='A multimedia framework based on the MPEG-4 Systems standard'
 arch=(x86_64)
@@ -10,32 +10,31 @@
 url=https://gpac.wp.imt.fr/
 license=(LGPL)
 depends=(
-  ffmpeg
-  glu
-  libxv
+  glibc
+  openssl
+  xz
+  zlib
 )
-makedepends=(
-  git
-  jack
-  a52dec
-  freetype2
-  faad2
-  libmad
-  mesa
-  sdl2
-)
-optdepends=(
-  'jack: for jack support'
-  'a52dec: for A52 support'
-  'faad2: for AAC support'
-  'libmad: for mp3 support'
-  'sdl2: for sdl support'
-)
+makedepends=(git)
 provides=(libgpac.so)
-options=(staticlibs)
-source=(git+https://github.com/gpac/gpac.git#tag=v${pkgver})
-sha256sums=('SKIP')
+_tag=a99c032b7afbc2e0a55d0259fd09b4139f8a7402
+source=(git+https://github.com/gpac/gpac.git#tag=${_tag})
+sha256sums=(SKIP)
 
+pkgver() {
+  cd gpac
+
+  git describe --tags | sed 's/^v//'
+}
+
+prepare() {
+  cd gpac
+
+  git cherry-pick -n 4710737bed502534499754afd730601c7ffb3d7b
+  git cherry-pick -n 1bfe33a9f4f985065efbff00ff700cca9e380be9
+  git cherry-pick -n 45633fabccf331405f5c09aa44db86d6962dfd0f
+}
+
 build() {
   cd gpac
 
@@ -42,15 +41,17 @@
   ./configure \
     --prefix=/usr \
     --mandir=/usr/share/man \
-    --X11-path=/usr \
+    --disable-oss-audio \
+    --disable-dvb4linux \
+    --disable-qjs \
+    --enable-pic \
     --use-js=no
   make
 }
 
 package() {
-  cd gpac
-
-  make DESTDIR="${pkgdir}" STRIP=true install install-lib
+  make DESTDIR="${pkgdir}" STRIP=true -C gpac install
+  make DESTDIR="${pkgdir}" STRIP=true -C gpac install-lib
 }
 
 # vim: ts=2 sw=2 et:

Deleted: gpac-ffmpeg-4.0.patch
===================================================================
--- gpac-ffmpeg-4.0.patch	2020-07-21 11:21:27 UTC (rev 664713)
+++ gpac-ffmpeg-4.0.patch	2020-07-21 11:21:34 UTC (rev 664714)
@@ -1,42 +0,0 @@
-diff -rupN gpac-0.7.1.orig/applications/dashcast/video_encoder.c gpac-0.7.1/applications/dashcast/video_encoder.c
---- gpac-0.7.1.orig/applications/dashcast/video_encoder.c	2018-04-26 09:19:52.938118328 +0200
-+++ gpac-0.7.1/applications/dashcast/video_encoder.c	2018-04-26 09:20:03.165170164 +0200
-@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil
- 	}
- 
- 	//the global header gives access to the extradata (SPS/PPS)
--	video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+	video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
- 	video_output_file->vstream_idx = 0;//video_stream->index;
- 
-diff -rupN gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
---- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c	2018-04-26 09:19:53.034788555 +0200
-+++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c	2018-04-26 09:30:09.739463486 +0200
-@@ -49,7 +49,7 @@
- static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
- 	uint8_t * buffer;
- 	/* Size of buffer must be larger, see avcodec_decode_video2 documentation */
--	u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
-+	u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
- 	if (oldBuffer)
- 		gf_free(oldBuffer);
- 	buffer = (uint8_t*)gf_malloc( allocatedSz );
-@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
- 		capability->cap.valueInt = 1;
- 		return GF_OK;
- 	case GF_CODEC_PADDING_BYTES:
--		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
-+		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
- 		return GF_OK;
- 	case GF_CODEC_REORDER:
- 		capability->cap.valueInt = 1;
-@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B
- 		break;
- 
- 	case GF_CODEC_PADDING_BYTES:
--		capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE;
-+		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
- 		break;
- 	default:
- 		capability->cap.valueInt = 0;

Deleted: gpac-openssl-1.1.patch
===================================================================
--- gpac-openssl-1.1.patch	2020-07-21 11:21:27 UTC (rev 664713)
+++ gpac-openssl-1.1.patch	2020-07-21 11:21:34 UTC (rev 664714)
@@ -1,11 +0,0 @@
---- a/src/utils/downloader.c
-+++ b/src/utils/downloader.c
-@@ -391,7 +391,6 @@
- 	}
- 	SSL_library_init();
- 	SSL_load_error_strings();
--	SSLeay_add_all_algorithms();
- 	SSLeay_add_ssl_algorithms();
- 	_ssl_is_initialized = GF_TRUE;
- 	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
-