multimedia/gpac: Updated for version 1.0.1.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 10 insertions, 58 deletions

diff --git a/multimedia/gpac/README b/multimedia/gpac/README
index 14dcadadffd4..cadc77b6f0bb 100644
--- a/multimedia/gpac/README
+++ b/multimedia/gpac/README
@@ -2,5 +2,5 @@ GPAC is mainly used to package multimedia content for local or streaming
 playback.  GPAC includes MP4Box utility which lets packaging of 
 various audio and video codecs into mp4 container.
 
-Optional dependencies include the following: wxPython, faad2, ffmpeg,
-xvidcore, jack, and xmlrpc-c.
+Optional dependencies include the following: wxPython, js, faad2, ffmpeg,
+xvidcore, jack, xulrunner and xmlrpc-c.
diff --git a/multimedia/gpac/gpac-ffmpeg-4.0.patch b/multimedia/gpac/gpac-ffmpeg-4.0.patch
deleted file mode 100644
index 05132e19e8ff..000000000000
--- a/multimedia/gpac/gpac-ffmpeg-4.0.patch
+++ /dev/null
@@ -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;
diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild
index c7cd430d33d2..9f80cdf070e8 100644
--- a/multimedia/gpac/gpac.SlackBuild
+++ b/multimedia/gpac/gpac.SlackBuild
@@ -26,7 +26,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="gpac"
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -75,7 +75,7 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -f $PRGNAM-$VERSION
+rm -fR $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root.root .
@@ -88,12 +88,6 @@ find -L . \
 # configure doesn't have --libdir option.
 sed -i "s/^libdir=\".*\"$/libdir=\"lib$LIBDIRSUFFIX\"/" configure
 
-# remove this to let it build against openssl-1.1.x
-sed -i "/SSLeay_add_all_algorithms/d" src/utils/downloader.c
-
-# patch for ffmpeg-4.x
-patch -p1 < $CWD/gpac-ffmpeg-4.0.patch
-
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
@@ -112,7 +106,7 @@ make install-lib DESTDIR=$PKG
 ### remove $PKG/usr/share/gpac directory
 ### only contains gpac.mp4 file which
 ### doesn't seem to play with mplayer
-rm -fr $PKG/usr/share
+#rm -fr $PKG/usr/share
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -121,7 +115,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING Changelog INSTALLME README.md TODO doc/configuration.html \
+cp -a COPYING Changelog README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
diff --git a/multimedia/gpac/gpac.info b/multimedia/gpac/gpac.info
index 8185ad5df757..9b1adc7085f8 100644
--- a/multimedia/gpac/gpac.info
+++ b/multimedia/gpac/gpac.info
@@ -1,8 +1,8 @@
 PRGNAM="gpac"
-VERSION="0.7.1"
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
-DOWNLOAD="https://github.com/gpac/gpac/archive/v0.7.1/gpac-0.7.1.tar.gz"
-MD5SUM="3b78b7b5bc022bbdeca193cc80281960"
+VERSION="1.0.1"
+HOMEPAGE="http://gpac.wp.mines-telecom.fr"
+DOWNLOAD="https://github.com/gpac/gpac/archive/v1.0.1/gpac-1.0.1.tar.gz"
+MD5SUM="52f6711e43a8d271ebec0c2ea2afab4a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""