From 4994e3f2c27df62c1f7f8f2fd7834ec5d282c341 Mon Sep 17 00:00:00 2001
From: Miguel de la Cruz <miguel@mcrx.me>
Date: Sun, 24 Sep 2017 17:45:47 +0100
Subject: [PATCH 1/2] gpac: 0.5.0 -> 0.7.1

---
 lib/maintainers.nix                      |  1 +
 pkgs/applications/video/gpac/default.nix | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ec0d49dd35d..6253197fd1f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -370,6 +370,7 @@
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   metabar = "Celine Mercier <softs@metabarcoding.org>";
+  mgdelacroix = "Miguel de la Cruz <mgdelacroix@gmail.com>";
   mguentner = "Maximilian Güntner <code@klandest.in>";
   mic92 = "Jörg Thalheim <joerg@thalheim.io>";
   michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index 927842916a1..c3f949ae5b7 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchsvn, pkgconfig, zlib }:
+{ stdenv, fetchFromGitHub, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "gpac-0.5.0-svn";
+  version = "0.7.1";
+  name = "gpac-${version}";
 
-  src = fetchsvn {
-    url = "http://svn.code.sf.net/p/gpac/code/trunk/gpac";
-    rev = "4749";
-    sha256 = "0y38pmp64a2l70y1yby90qzxfzx8y7r0cdmgjxzw86jh6si5ndhp";
+  src = fetchFromGitHub {
+    owner = "gpac";
+    repo = "gpac";
+    rev = "v${version}";
+    sha256 = "197c5968p5bzvk0ga347fwgkqh4j1v3z65wlx65c5m9gwfxz2k2q";
   };
 
   # this is the bare minimum configuration, as I'm only interested in MP4Box
@@ -27,10 +29,13 @@ stdenv.mkDerivation rec {
       A multimedia packager, called MP4Box,
       And some server tools included in MP4Box and MP42TS applications.
     '';
-    homepage = http://gpac.wp.mines-telecom.fr;
+    homepage = https://gpac.wp.imt.fr;
     license = stdenv.lib.licenses.lgpl21;
 
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+    maintainers = [
+      stdenv.lib.maintainers.bluescreen303
+      stdenv.lib.maintainers.mgdelacroix
+    ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 2847acf517475bdac6731b96ec406006f5105494 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 1 Oct 2017 08:59:12 +0000
Subject: [PATCH 2/2] gpac: fix up

---
 pkgs/applications/video/gpac/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix
index c3f949ae5b7..7a8b66d2d28 100644
--- a/pkgs/applications/video/gpac/default.nix
+++ b/pkgs/applications/video/gpac/default.nix
@@ -13,9 +13,13 @@ stdenv.mkDerivation rec {
 
   # this is the bare minimum configuration, as I'm only interested in MP4Box
   # For most other functionality, this should probably be extended
-  nativeBuildInputs = [ pkgconfig zlib ];
+  nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  buildInputs = [ zlib ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
     description = "Open Source multimedia framework for research and academic purposes";
     longDescription = ''
       GPAC is an Open Source multimedia framework for research and academic purposes.
@@ -30,12 +34,8 @@ stdenv.mkDerivation rec {
       And some server tools included in MP4Box and MP42TS applications.
     '';
     homepage = https://gpac.wp.imt.fr;
-    license = stdenv.lib.licenses.lgpl21;
-
-    maintainers = [
-      stdenv.lib.maintainers.bluescreen303
-      stdenv.lib.maintainers.mgdelacroix
-    ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ bluescreen303 mgdelacroix ];
+    platforms = platforms.linux;
   };
 }