avidemux3: version 2.7.3

4 files changed, 7 insertions, 58 deletions

diff --git a/video/avidemux3/DETAILS b/video/avidemux3/DETAILS
index a4c35d6da7..9578bff9bf 100755
--- a/video/avidemux3/DETAILS
+++ b/video/avidemux3/DETAILS
@@ -1,11 +1,12 @@
            SPELL=avidemux3
-         VERSION=2.7.0
+         VERSION=2.7.3
           SOURCE=${SPELL%3}_$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%3}_$VERSION"
 # There's fosshub, too, but that is unfriendly to wget(?).
+#   SOURCE_URL[0]=https://www.fosshub.com/Avidemux.html?dwl=$SOURCE
    SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/${SPELL%3}/$SOURCE
         WEB_SITE=http://fixounet.free.fr/avidemux/
-     SOURCE_HASH=sha512:7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
+     SOURCE_HASH=sha512:c8db210a28681b0447a605215e63ca0b12092904e8e443611dbbc1de374d927803fb2eae15565b9b2e2bf4f0e5d6e83f866cb0f3cbf3e772b902e79b82d73f6e
       LICENSE[0]=GPL
          ENTERED=20140319
         KEYWORDS="video"
diff --git a/video/avidemux3/HISTORY b/video/avidemux3/HISTORY
index b1676409cf..5c8a3d185a 100644
--- a/video/avidemux3/HISTORY
+++ b/video/avidemux3/HISTORY
@@ -1,3 +1,7 @@
+2019-05-28 Thomas Orgis <sobukus@sourcemage.org>
+	* DETAILS: version 2.7.3
+	* PRE_BUILD, avidemux-2.7.0-fix-random-port.patch: gone upstream
+
 2018-01-22 Thomas Orgis <sobukus@sourcemage.org>
 	* DETAILS: version 2.7.0
 	* PRE_BUILD, avidemux-2.7.0-fix-random-port.patch: fix stupid bug
diff --git a/video/avidemux3/PRE_BUILD b/video/avidemux3/PRE_BUILD
deleted file mode 100755
index 0ef5dfef8e..0000000000
--- a/video/avidemux3/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SCRIPT_DIRECTORY/avidemux-2.7.0-fix-random-port.patch"
diff --git a/video/avidemux3/avidemux-2.7.0-fix-random-port.patch b/video/avidemux3/avidemux-2.7.0-fix-random-port.patch
deleted file mode 100644
index 7d286035ad..0000000000
--- a/video/avidemux3/avidemux-2.7.0-fix-random-port.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 1b1ddba7caa751100f8500e1fa866e2d72a11d10 Mon Sep 17 00:00:00 2001
-From: eumagga0x2a <eumagga0x2a@users.noreply.github.com>
-Date: Mon, 22 Jan 2018 10:31:47 +0100
-Subject: [PATCH] [coreSocket/jobs] Initialize localPort, use printf macros
- matching the data type
-
----
- avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp        | 5 +++--
- avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp | 4 ++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-index f441b0e10..95244bed5 100644
---- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-@@ -165,12 +165,13 @@ jobWindow::jobWindow(void) : QDialog()
-    connect(ui.pushButtonCleanup,SIGNAL(pressed()),this,SLOT(cleanup()));
- 
-     // Start our socket
--   if(false==mySocket.createBindAndAccept(&localPort))
-+    localPort=0;
-+    if(false==mySocket.createBindAndAccept(&localPort))
-     {
-         popup("Cannot bind socket");
-         exit(-1);
-     }
--    ADM_info("Socket bound to %d\n",(int)localPort);
-+    ADM_info("Socket bound to %" PRIu32"\n",localPort);
-     //ADM_socket *n=mySocket.waitForConnect(5000);
-     refreshList();
-     dialog=NULL;
-diff --git a/avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp b/avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp
-index 8add543ed..db42a7e97 100644
---- a/avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp
-+++ b/avidemux_core/ADM_coreSocket/src/ADM_coreSocket.cpp
-@@ -184,7 +184,7 @@ if (setsockopt(mySocket, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int)) < 0)
-     ADM_error("Oops : setsockopt(SO_REUSEADDR) failed\n");
- #endif
- 
--  ADM_info("Binding on %s:%d\n",BIND_ADR,*port);
-+  ADM_info("Binding on %s:%" PRIu32"\n",BIND_ADR,*port);
-   sockaddr_in service;
-   service.sin_family = AF_INET;
-   service.sin_addr.s_addr = inet_addr(BIND_ADR);
-@@ -209,7 +209,7 @@ if (setsockopt(mySocket, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int)) < 0)
-     *port= ntohs ( ((SADDR_IN *)&service)->sin_port ); 
-      
-    // Set high buffer + low delay
--    ADM_info("Socket bound to port %u\n",(unsigned int)*port);
-+    ADM_info("Socket bound to port %" PRIu32"\n",*port);
- 
-     int er=listen(mySocket,1);
- 	if(er)