pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

avidemux-qt: Fix building on NetBSD



Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <triaxx%NetBSD.org@localhost>
Pushed By:	frederic
Date:		Sun Jan 8 23:25:45 2023 +0100
Changeset:	6bb4948f5847146357c26018ed2045098ddb2053

Modified Files:
	avidemux-qt/PLIST
Added Files:
	avidemux-qt/patches/patch-avidemux_qt4_ADM__jobs_src_CMakeLists.txt
	avidemux-qt/patches/patch-avidemux_qt4_adm__osx.cmake

Log Message:
avidemux-qt: Fix building on NetBSD

pkgsrc-changes:
---------------
  * Remove Darwin specific binary names.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6bb4948f5847146357c26018ed2045098ddb2053

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 avidemux-qt/PLIST                                      | 13 ++++++++-----
 .../patch-avidemux_qt4_ADM__jobs_src_CMakeLists.txt    | 18 ++++++++++++++++++
 avidemux-qt/patches/patch-avidemux_qt4_adm__osx.cmake  | 14 ++++++++++++++
 3 files changed, 40 insertions(+), 5 deletions(-)

diffs:
diff --git a/avidemux-qt/PLIST b/avidemux-qt/PLIST
index 04081d6517..5265ab03ea 100644
--- a/avidemux-qt/PLIST
+++ b/avidemux-qt/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD$
-bin/Avidemux2.8
-bin/avidemux_jobs
+${PLIST.qt5}bin/avidemux3_jobs_qt5
+${PLIST.qt5}bin/avidemux3_qt5
 include/avidemux/2.8/qt5/ADM_UIs/ADM_QSettings.h
 include/avidemux/2.8/qt5/ADM_UIs/ADM_UIQT46_export.h
 include/avidemux/2.8/qt5/ADM_UIs/ADM_dialogFactoryQt4.h
@@ -11,9 +11,10 @@ include/avidemux/2.8/qt5/ADM_UIs/T_openGLFilter.h
 include/avidemux/2.8/qt5/ADM_openGL/ADM_openGL_export.h
 include/avidemux/2.8/qt5/ADM_openGL/ADM_openGl.h
 include/avidemux/2.8/qt5/config.h
-lib/libADM_UIQT56.dylib
-lib/libADM_openGLQT56.dylib
-lib/libADM_render6_QT5.dylib
+lib/libADM_UIQT56.${SOEXT}
+lib/libADM_openGLQT56.${SOEXT}
+lib/libADM_render6_QT5.${SOEXT}
+${PLIST.notdarwin}share/applications/org.avidemux.Avidemux.desktop
 share/avidemux6/qt5/i18n/avidemux_ca.qm
 share/avidemux6/qt5/i18n/avidemux_cs.qm
 share/avidemux6/qt5/i18n/avidemux_da.qm
@@ -60,3 +61,5 @@ share/avidemux6/qt5/i18n/qtbase_tr.qm
 share/avidemux6/qt5/i18n/qtbase_uk.qm
 share/avidemux6/qt5/i18n/qtbase_zh_CN.qm
 share/avidemux6/qt5/i18n/qtbase_zh_TW.qm
+${PLIST.notdarwin}share/icons/hicolor/128x128/apps/org.avidemux.Avidemux.png
+${PLIST.notdarwin}share/metainfo/org.avidemux.Avidemux.appdata.xml
diff --git a/avidemux-qt/patches/patch-avidemux_qt4_ADM__jobs_src_CMakeLists.txt b/avidemux-qt/patches/patch-avidemux_qt4_ADM__jobs_src_CMakeLists.txt
new file mode 100644
index 0000000000..77421320c3
--- /dev/null
+++ b/avidemux-qt/patches/patch-avidemux_qt4_ADM__jobs_src_CMakeLists.txt
@@ -0,0 +1,18 @@
+$NetBSD$
+
+We don't want a specific binary only for Darwin.
+
+--- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2022-09-17 13:59:17.000000000 +0000
++++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt
+@@ -75,11 +75,6 @@ TARGET_LINK_LIBRARIES(avidemux3_jobs_${Q
+ ###########################################
+ # OS Specific
+ ###########################################
+-if (WIN32 OR APPLE)
+-	set_property(TARGET avidemux3_jobs_${QT_EXTENSION} PROPERTY OUTPUT_NAME avidemux_jobs)
+-endif (WIN32 OR APPLE)
+-
+-
+ IF (APPLE)
+ 	add_source_cflags(ADM_runOneJob.cpp "-DAVIDEMUX_MAJOR_MINOR=\"${AVIDEMUX_MAJOR_MINOR}\"")
+ 	target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-framework CoreServices -framework CoreAudio -framework AudioUnit -framework Carbon")
diff --git a/avidemux-qt/patches/patch-avidemux_qt4_adm__osx.cmake b/avidemux-qt/patches/patch-avidemux_qt4_adm__osx.cmake
new file mode 100644
index 0000000000..0e600c5aa6
--- /dev/null
+++ b/avidemux-qt/patches/patch-avidemux_qt4_adm__osx.cmake
@@ -0,0 +1,14 @@
+$NetBSD$
+
+We don't want a specific binary only for Darwin.
+
+--- avidemux/qt4/adm_osx.cmake.orig	2022-09-17 13:59:17.000000000 +0000
++++ avidemux/qt4/adm_osx.cmake
+@@ -30,7 +30,6 @@ MACRO(ADM_MAIN_APP)
+     ELSE(CREATE_BUNDLE)
+         ADD_EXECUTABLE(avidemux3_${QT_EXTENSION} ${ADM_EXE_SRCS})
+     ENDIF(CREATE_BUNDLE)
+-    SET_PROPERTY(TARGET avidemux3_${QT_EXTENSION} PROPERTY OUTPUT_NAME Avidemux${AVIDEMUX_MAJOR_MINOR})
+     IF (${QT_EXTENSION} STREQUAL "qt6")
+         TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION} "${QT_CORE_LIBRARY}" "${QT_QTGUI_LIBRARY}")
+     ELSE (${QT_EXTENSION} STREQUAL "qt6")


Home | Main Index | Thread Index | Old Index