haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avidemux: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-12-29 19:30:10 +10:00
parent f795f2725a
commit 94f3885c9a
3 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
media-video/avidemux/additional-files/haikuicons.zip
View File

Binary file not shown.

4
media-video/avidemux/avidemux-2.7.8.recipe → media-video/avidemux/avidemux-2.8.0.recipe
View File

@@ -6,9 +6,9 @@ can be automated using projects, job queue and powerful scripting capabilities."
HOMEPAGE="http://fixounet.free.fr/avidemux/"
COPYRIGHT="2001–2021 Mean"
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="1"
SOURCE_URI="https://sourceforge.net/projects/avidemux/files/avidemux/$portVersion/avidemux_$portVersion.tar.gz"
CHECKSUM_SHA256="628a404f521ff2812760700ae3e2aa78e5816b0ff3fb6fd05ac3e75248d97401"
CHECKSUM_SHA256="d1ec6f5277e51228ecf0ee1ca89fae24c591f520f87ce96fabec8818d04de33b"
SOURCE_DIR="avidemux_$portVersion"
PATCHES="avidemux-$portVersion.patchset"
ADDITIONAL_FILES="

121
media-video/avidemux/patches/avidemux-2.7.8.patchset → media-video/avidemux/patches/avidemux-2.8.0.patchset
View File

@@ -1,16 +1,43 @@
From 20d10f2864f35c6053a0e494367505eebd762493 Mon Sep 17 00:00:00 2001
From 7e9ed4dafd3151061299116c745a0ec1abd3361a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 28 Jun 2021 21:36:01 +1000
Date: Wed, 29 Dec 2021 15:12:15 +1000
Subject: Add Haiku support
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7df8bb0..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-*~
-*.rej
-*.orig
-[tT]ags
-Doxyfile
-*.kdev*
-ffconf
-*.sw*
-build*
-debs
-addons/*
-install/*
-avidemux/qt4/common
-oldcrap/*
-nbproject
-avidemux/oldFiles/
-myBuild*
-oprofile_data
-avidemux/winInstaller/AvidemuxVersion.nsh
-avidemux/qt4/xdg_data/org.avidemux.Avidemux.appdata.xml
-*.DS_Store
diff --git a/avidemux/common/main.cpp b/avidemux/common/main.cpp
old mode 100755
new mode 100644
index 4b3306a..99e066d
index 834806e..8e1e43b
--- a/avidemux/common/main.cpp
+++ b/avidemux/common/main.cpp
@@ -91,7 +91,9 @@ int main(int _argc, char *_argv[])
@@ -92,7 +92,9 @@ int main(int _argc, char *_argv[])
}
#endif
@@ -20,7 +47,7 @@ index 4b3306a..99e066d
char **argv;
int argc;
@@ -113,9 +115,9 @@ int main(int _argc, char *_argv[])
@@ -114,9 +116,9 @@ int main(int _argc, char *_argv[])
#ifdef _WIN32
freeUtf8CommandLine(argc, argv);
#endif
@@ -70,10 +97,19 @@ index cfb29a9..c64e971 100644
return 0;
}
diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp
index 8312320..c241ef6 100644
index caba43f..d8b1e39 100644
--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp
+++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp
@@ -77,9 +77,6 @@ bool ADM_QPreviewCleanup(void)
@@ -29,7 +29,7 @@
/* Probably on unix/X11 ..*/
#ifdef __APPLE__
# include <Carbon/Carbon.h>
-#elif !defined(_WIN32)
+#elif !defined(_WIN32) && !defined(__HAIKU__)
# if QT_VERSION < QT_VERSION_CHECK(5,0,0)
# include <QX11Info> // removed in qt5
# else
@@ -79,9 +79,6 @@ bool ADM_QPreviewCleanup(void)
*
* @param z
*/
@@ -83,7 +119,7 @@ index 8312320..c241ef6 100644
ADM_Qvideo::ADM_Qvideo(QFrame *z) : QWidget(z)
{
useExternalRedraw(true);
@@ -99,8 +96,6 @@ ADM_Qvideo::ADM_Qvideo(QFrame *z) : QWidget(z)
@@ -101,8 +98,6 @@ ADM_Qvideo::ADM_Qvideo(QFrame *z) : QWidget(z)
hostFrame=z;
} //{setAutoFillBackground(false);}
@@ -92,13 +128,23 @@ index 8312320..c241ef6 100644
ADM_Qvideo::~ADM_Qvideo()
{
@@ -259,6 +254,9 @@ void UI_getWindowInfo(void *draw, GUI_WindowInfo *xinfo)
#if defined(_WIN32)
xinfo->display=(void *)videoWindow->winId();
xinfo->systemWindowId=videoWindow->winId();
+#elif defined(__HAIKU__)
+ xinfo->display = NULL;
+ xinfo->systemWindowId=0;
#elif defined(__APPLE__)
# if defined(ADM_CPU_X86_64)
xinfo->display = NULL; // we may not call winId() on a QWidget on macOS, it breaks OpenGL
diff --git a/avidemux/qt4/CMakeLists.txt b/avidemux/qt4/CMakeLists.txt
old mode 100755
new mode 100644
index 5d1ab5f..235f718
index e0e431b..b50c552
--- a/avidemux/qt4/CMakeLists.txt
+++ b/avidemux/qt4/CMakeLists.txt
@@ -30,7 +30,11 @@ ELSE(WIN32)
@@ -32,7 +32,11 @@ ELSE(WIN32)
IF(APPLE)
include(adm_osx.cmake)
ELSE(APPLE)
@@ -261,10 +307,10 @@ index 29054cd..db88952 100644
ENDIF (UNIX)
diff --git a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h
index 3a7e030..d534a14 100644
index 490784d..c7a6718 100644
--- a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h
+++ b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h
@@ -58,7 +58,7 @@ static optionDesc myOptions[]={
@@ -61,7 +61,7 @@ static optionDesc myOptions[]={
{ LASTPROJECTS_FILE3,"lastprojects.file3" ,ADM_param_stdstring ,"", 0, 0},
{ LASTPROJECTS_FILE4,"lastprojects.file4" ,ADM_param_stdstring ,"", 0, 0},
{ MESSAGE_LEVEL,"message_level" ,ADM_param_uint32_t ,"2", 0, 2},
@@ -274,10 +320,10 @@ index 3a7e030..d534a14 100644
{ VIDEODEVICE,"videodevice" ,ADM_param_uint32_t ,"0", 0, 10},
{ PRIORITY_ENCODING,"priority.encoding" ,ADM_param_uint32_t ,"3", 0, 4},
diff --git a/avidemux_plugins/ADM_audioDevices/CMakeLists.txt b/avidemux_plugins/ADM_audioDevices/CMakeLists.txt
index 0d7136b..f655b75 100644
index ba5d4f2..a29ac2e 100644
--- a/avidemux_plugins/ADM_audioDevices/CMakeLists.txt
+++ b/avidemux_plugins/ADM_audioDevices/CMakeLists.txt
@@ -35,3 +35,7 @@ endif(APPLE)
@@ -39,3 +39,7 @@ endif(APPLE)
if(WIN32)
ADD_SUBDIRECTORY(Win32)
endif(WIN32)
@@ -803,7 +849,7 @@ index 43a135c..99da224 100644
string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
diff --git a/cmake/admFFmpegBuild_helpers.cmake b/cmake/admFFmpegBuild_helpers.cmake
index f4d483a..d22cd25 100644
index 40796ef..1f5fc39 100644
--- a/cmake/admFFmpegBuild_helpers.cmake
+++ b/cmake/admFFmpegBuild_helpers.cmake
@@ -44,7 +44,7 @@ set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc)
@@ -815,7 +861,7 @@ index f4d483a..d22cd25 100644
xadd("--enable-swscale --disable-swresample")
xadd("--disable-doc --disable-programs")
@@ -286,7 +286,7 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE)
@@ -295,7 +295,7 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE)
MESSAGE(STATUS "Configuring done, processing")
@@ -825,12 +871,12 @@ index f4d483a..d22cd25 100644
string(REGEX MATCH "#define[ ]+HAVE_X86ASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
diff --git a/cmake/admFFmpegBuild_native.cmake b/cmake/admFFmpegBuild_native.cmake
index 6d7c695..5b5d1d2 100644
index ba4c020..b7638c6 100644
--- a/cmake/admFFmpegBuild_native.cmake
+++ b/cmake/admFFmpegBuild_native.cmake
@@ -47,6 +47,11 @@ if (NOT APPLE)
@@ -47,6 +47,11 @@ if (NOT APPLE AND NOT ADM_CPU_X86_32)
xadd(--enable-lto)
endif (NOT APPLE)
endif (NOT APPLE AND NOT ADM_CPU_X86_32)
+if (HAIKU)
+ xadd(--disable-runtime-cpudetect)
@@ -884,40 +930,3 @@ index 00304cf..07077fa 100644
--
2.30.2
From a58e92ab37a57f9601ef91ba436ca48d833e9e73 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 28 Jun 2021 21:54:17 +1000
Subject: Fix build
diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp
index c241ef6..4c6087a 100644
--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp
+++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp
@@ -30,10 +30,12 @@
# if QT_VERSION < QT_VERSION_CHECK(5,0,0)
# include <QX11Info> // removed in qt5
# else
+#ifndef __HAIKU__
extern "C"
{
extern void *XOpenDisplay( char *name);
}
+#endif
# include <QWindow>
# endif
#endif
@@ -204,6 +206,9 @@ void UI_getWindowInfo(void *draw, GUI_WindowInfo *xinfo)
#if defined(_WIN32)
xinfo->display=(void *)videoWindow->winId();
xinfo->systemWindowId=videoWindow->winId();
+#elif defined(__HAIKU__)
+ xinfo->display = NULL;
+ xinfo->systemWindowId=0;
#elif defined(__APPLE__)
# if defined(ADM_CPU_X86_64)
xinfo->display = NULL; // we may not call winId() on a QWidget on macOS, it breaks OpenGL
--
2.30.2