Page MenuHomeFreeBSD
Files F146227896

D35151.diff
No OneTemporary
Actions

D35151.diff
View Options

Index: multimedia/avidemux-plugins/Makefile
===================================================================
--- multimedia/avidemux-plugins/Makefile
+++ multimedia/avidemux-plugins/Makefile
@@ -22,15 +22,15 @@
PLUGIN_UI= COMMON SETTINGS
.if ${PORT_OPTIONS:MCLI}
-BUILD_DEPENDS+= avidemux-cli>0:multimedia/avidemux-cli
-RUN_DEPENDS+= avidemux-cli>0:multimedia/avidemux-cli
+BUILD_DEPENDS+= avidemux-cli>=${AVIDEMUX_VERSION}:multimedia/avidemux-cli
+RUN_DEPENDS+= avidemux-cli>=${AVIDEMUX_VERSION}:multimedia/avidemux-cli
PLUGIN_UI+= CLI
.endif
.if ${PORT_OPTIONS:MQT5}
-BUILD_DEPENDS+= avidemux-qt5>0:multimedia/avidemux-qt5
-RUN_DEPENDS+= avidemux-qt5>0:multimedia/avidemux-qt5
-PLUGIN_UI+= QT4
+BUILD_DEPENDS+= avidemux-qt5>=${AVIDEMUX_VERSION}:multimedia/avidemux-qt5
+RUN_DEPENDS+= avidemux-qt5>=${AVIDEMUX_VERSION}:multimedia/avidemux-qt5
+PLUGIN_UI+= QT4 # ???
.endif
CMAKE_ARGS+= -DPLUGIN_UI="${PLUGIN_UI}"
Index: multimedia/avidemux/Makefile.common
===================================================================
--- multimedia/avidemux/Makefile.common
+++ multimedia/avidemux/Makefile.common
@@ -16,19 +16,26 @@
LICENSE= GPLv2
-USE_GNOME= libxml2
OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options
-USES= cmake:noninja pkgconfig iconv gmake compiler:features sqlite
-USES+= dos2unix gnome
+USES= cmake:noninja compiler:features dos2unix gmake gnome iconv pkgconfig sqlite
+USE_GNOME= libxml2
DOS2UNIX_FILES= cmake/admCheckMiscLibs.cmake \
avidemux_core/ADM_coreVideoCodec/include/ADM_coreVideoCodec6_export.h \
avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h
-CMAKE_ARGS+= -DGNUMAKE_EXECUTABLE=gmake
-CMAKE_ARGS+= -DAVIDEMUX_PACKAGER=none
-CMAKE_ARGS+= -DGTK:BOOL=OFF
-CMAKE_ARGS+= -DESD:BOOL=OFF
+
+CMAKE_ARGS+= -DAVIDEMUX_PACKAGER=none \
+ -DGNUMAKE_EXECUTABLE=gmake \
+ -DLIBEXECINFO_INCLUDE_DIR=/usr/include \
+ -DLIBEXECINFO_LIBRARY_DIR=-lexecinfo
+
+CMAKE_OFF+= GTK \
+ ESD
+
+# We haven't ALSA(Never ???) & Aften(Yet) on FreeBSD
+CMAKE_OFF+= ARTS ALSA AFTEN
+
CXXFLAGS+= -I${LOCALBASE}/include
MAKE_JOBS_UNSAFE= yes
NOPRECIOUSMAKEVARS= yes # ARCH
@@ -43,8 +50,8 @@
OPTIONS_DEFAULT= FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \
FAAD VDPAU VORBIS DCA FDK QT5 TINYPY VAPOURSYNTH \
PULSEAUDIO
-
OPTIONS_SUB= yes
+
AOM_DESC= AOM AV1 decoder support
CLI_DESC= Build CLI tool
FDK_DESC= FDK AAC codec support
@@ -53,232 +60,99 @@
NLS_USES= gettext-runtime
NLS_CMAKE_BOOL= GETTEXT
-FRIBIDI_CMAKE_OFF= -DFRIBIDI:BOOL=OFF
+FRIBIDI_CMAKE_BOOL= FRIBIDI
FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi
-OPUS_CMAKE_OFF= -DOPUS:BOOL=OFF -DOPUS_ENCODER:BOOL=OFF
+OPUS_CMAKE_BOOL= OPUS OPUS_ENCODER
OPUS_LIB_DEPENDS= libopus.so:audio/opus
-TWOLAME_CMAKE_OFF= -DTWOLAME:BOOL=OFF
+TWOLAME_CMAKE_BOOL= TWOLAME
TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame
+QT5_CMAKE_BOOL= X11
+QT5_USES= gl gnome qt:5 xorg
+QT5_USE= GL=gl,glu \
+ GNOME=libxslt \
+ QT=core,gui,network,widgets,qmake_build,buildtools_build,linguist_build \
+ XORG=x11
-.if !defined(PACKAGE_BUILDING)
-OPTIONS_DEFAULT+= LAME FAAC AMR X264
-.endif
+OSS_CMAKE_BOOL= OSS OSS_SUPPORT
-.include <bsd.port.options.mk>
+JACK_LIB_DEPENDS= libjack.so:audio/jack
+JACK_CMAKE_BOOL= JACK
-# for libexecinfo: (so that __builtin_frame_address() finds the top
-# of the stack)
-.if ${ARCH} == amd64
-CFLAGS+= -fno-omit-frame-pointer
-#MAKE_ENV+= ARCH=x86_64
-#CONFIGURE_ENV+= ARCH=x86_64
-.endif
-CMAKE_ARGS+= -DLIBEXECINFO_INCLUDE_DIR=/usr/include
-CMAKE_ARGS+= -DLIBEXECINFO_LIBRARY_DIR=-lexecinfo
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+PULSEAUDIO_CMAKE_BOOL= PULSEAUDIOSIMPLE
-# We haven't ALSA(Never) & Aften(Yet) on FreeBSD
-CMAKE_ARGS+= -DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF
+FDK_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac
+FDK_CMAKE_BOOL= FDK_AAC
-.if empty(PORT_OPTIONS:MQT5)
-CMAKE_ARGS+= -DX11:BOOL=OFF
-.else
-USE_GNOME+= libxslt
-.endif
+FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
+FREETYPE_CMAKE_BOOL= FREETYPE2
-.if ${PORT_OPTIONS:MQT5}
-USES+= gl qt:5 xorg
-USE_GL= gl glu
-USE_QT= core gui network widgets \
- qmake_build buildtools_build linguist_build
-USE_XORG= x11
-CMAKE_ARGS+= -DENABLE_QT5:BOOL=ON
-PLIST_SUB+= QT5=""
-.else
-CMAKE_ARGS+= -DQT4:BOOL=OFF
-PLIST_SUB+= QT5="@comment "
-.endif
+FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
+FONTCONFIG_CMAKE_BOOL= FONTCONFIG
-.if ${PORT_OPTIONS:MCLI}
-PLIST_SUB+= CLI=""
-.else
-PLIST_SUB+= CLI="@comment "
-.endif
+XVIDEO_USES= xorg
+XVIDEO_USE= XORG=xv,xext
+XVIDEO_CMAKE_BOOL= XVIDEO
-.if ${PORT_OPTIONS:MOSS}
-CMAKE_ARGS+= -DOSS:BOOL=ON -DOSS_SUPPORT:BOOL=ON
-.else
-CMAKE_ARGS+= -DOSS:BOOL=OFF -DOSS_SUPPORT:BOOL=OFF
-.endif
+FAAC_LIB_DEPENDS= libfaac.so:audio/faac
+FAAC_CMAKE_BOOL= FAAC
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+= libjack.so:audio/jack
-PLIST_SUB+= JACK=""
-.else
-CMAKE_ARGS+= -DJACK:BOOL=OFF
-PLIST_SUB+= JACK="@comment "
-.endif
+LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
+LAME_CMAKE_BOOL= LAME
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+= libpulse.so:audio/pulseaudio
-PLIST_SUB+= PULSEAUDIO=""
-.else
-CMAKE_ARGS+= -DPULSEAUDIOSIMPLE:BOOL=OFF
-PLIST_SUB+= PULSEAUDIO="@comment "
-.endif
+FAAD_LIB_DEPENDS= libfaad.so:audio/faad
+CMAKE_BOOL= FAAD NeAAC
-.if ${PORT_OPTIONS:MFDK}
-LIB_DEPENDS+= libfdk-aac.so:audio/fdk-aac
-PLIST_SUB+= FDK=""
-.else
-CMAKE_ARGS+= -DFDK_AAC:BOOL=OFF
-PLIST_SUB+= FDK="@comment "
-.endif
+X264_LIB_DEPENDS= libx264.so:multimedia/libx264
+X264_CMAKE_BOOL= X264
-.if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+= libfreetype.so:print/freetype2
-.else
-CMAKE_ARGS+= -DFREETYPE2:BOOL=OFF
-.endif
+X265_LIB_DEPENDS= libx265.so:multimedia/x265
+X265_CMAKE_BOOL= X265
-.if ${PORT_OPTIONS:MFONTCONFIG}
-LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig
-.else
-CMAKE_ARGS+= -DFONTCONFIG:BOOL=OFF
-.endif
+VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
+VPX_CMAKE_BOOL= VPXDEC VPXENC
-.if ${PORT_OPTIONS:MXVIDEO}
-USES+= xorg
-USE_XORG+= xv xext
-.else
-CMAKE_ARGS+= -DXVIDEO:BOOL=OFF
-.endif
+AOM_LIB_DEPENDS= libaom.so:multimedia/aom
+AOM_CMAKE_BOOL= AOMDEC
-.if ${PORT_OPTIONS:MFAAC}
-LIB_DEPENDS+= libfaac.so:audio/faac
-PLIST_SUB+= FAAC=""
-.else
-CMAKE_ARGS+= -DFAAC:BOOL=OFF
-PLIST_SUB+= FAAC="@comment "
-.endif
+XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid
+XVID_CMAKE_BOOL= XVID
-.if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+= libmp3lame.so:audio/lame
-PLIST_SUB+= LAME=""
-.else
-CMAKE_ARGS+= -DLAME:BOOL=OFF
-PLIST_SUB+= LAME="@comment "
-.endif
+TINYPY_CMAKE_BOOL= TINYPY
-.if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+= libfaad.so:audio/faad
-PLIST_SUB+= FAAD=""
-.else
-CMAKE_ARGS+= -DFAAD:BOOL=OFF -DNeAAC:BOOL=OFF
-PLIST_SUB+= FAAD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+= libx264.so:multimedia/libx264
-PLIST_SUB+= X264=""
-.else
-CMAKE_ARGS+= -DX264:BOOL=OFF
-PLIST_SUB+= X264="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MX265}
-LIB_DEPENDS+= libx265.so:multimedia/x265
-PLIST_SUB+= X265=""
-.else
-CMAKE_ARGS+= -DX265:BOOL=OFF
-PLIST_SUB+= X265="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+= libvpx.so:multimedia/libvpx
-PLIST_SUB+= VPX=""
-.else
-CMAKE_ARGS+= -DVPXDEC:BOOL=OFF -DVPXENC:BOOL=OFF
-PLIST_SUB+= VPX="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAOM}
-LIB_DEPENDS+= libaom.so:multimedia/aom
-PLIST_SUB+= AOM=""
-.else
-CMAKE_ARGS+= -DAOMDEC:BOOL=OFF
-PLIST_SUB+= AOM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MXVID}
-LIB_DEPENDS+= libxvidcore.so:multimedia/xvid
-PLIST_SUB+= XVID=""
-.else
-CMAKE_ARGS+= -DXVID:BOOL=OFF
-PLIST_SUB+= XVID="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTINYPY}
-PLIST_SUB+= TINYPY=""
-.else
-CMAKE_ARGS+= -DTINYPY:BOOL=OFF
-PLIST_SUB+= TINYPY="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDCA}
-LIB_DEPENDS+= libdca.so:multimedia/libdca
-PLIST_SUB+= DCA=""
-.else
-CMAKE_ARGS+= -DLIBDCA:BOOL=OFF
-PLIST_SUB+= DCA="@comment "
-.endif
+DCA_LIB_DEPENDS= libdca.so:multimedia/libdca
+DCA_CMAKE_BOOL= LIBDCA
-.if ${PORT_OPTIONS:MVAPOURSYNTH}
-LIB_DEPENDS+= libva.so:multimedia/libva \
+VAPOURSYNTH_LIB_DEPENDS= libva.so:multimedia/libva \
libvdpau.so:multimedia/libvdpau \
libvapoursynth.so:multimedia/vapoursynth
-USE_XORG+= x11
-PLIST_SUB+= VAPOURSYNTH=""
-.else
-CMAKE_ARGS+= -DVAPOURSYNTH:BOOL=OFF
-PLIST_SUB+= VAPOURSYNTH="@comment "
-.endif
+VAPOURSYNTH_USE= XORG=x11
+VAPOURSYNTH_CMAKE_BOOL= VAPOURSYNTH
-.if ${PORT_OPTIONS:MVAAPI}
-LIB_DEPENDS+= libva.so:multimedia/libva
-PLIST_SUB+= VAAPI=""
-.else
-CMAKE_ARGS+= -DVAAPI:BOOL=OFF -DLIBVA:BOOL=OFF
-PLIST_SUB+= VAAPI="@comment "
-.endif
+VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
+VAAPI_CMAKE_BOOL= VAAPI LIBVA
-.if ${PORT_OPTIONS:MVDPAU}
-LIB_DEPENDS+= libvdpau.so:multimedia/libvdpau
-PLIST_SUB+= VDPAU=""
-.else
-CMAKE_ARGS+= -DVDPAU:BOOL=OFF
-PLIST_SUB+= VDPAU="@comment "
-.endif
+VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
+VDPAU_CMAKE_BOOL= VDPAU
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+= libvorbis.so:audio/libvorbis
-PLIST_SUB+= VORBIS=""
-.else
-CMAKE_ARGS+= -DLIBVORBIS:BOOL=OFF -DVORBIS:BOOL=OFF
-PLIST_SUB+= VORBIS="@comment "
-.endif
+VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis
+VORBIS_CMAKE_BOOL= LIBVORBIS VORBIS
-.if ${PORT_OPTIONS:MAMR}
-LIB_DEPENDS+= libopencore-amrnb.so:audio/opencore-amr
-PLIST_SUB+= AMRNB=""
-PLIST_SUB+= AMRWB=""
-.else
-CMAKE_ARGS+= -DOPENCORE_AMRNB:BOOL=OFF
-PLIST_SUB+= AMRNB="@comment "
-CMAKE_ARGS+= -DOPENCORE_AMRWB:BOOL=OFF
-PLIST_SUB+= AMRWB="@comment "
+AMR_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
+AMR_CMAKE_BOOL= OPENCORE AMRNB AMRWB
+
+.if !defined(PACKAGE_BUILDING)
+OPTIONS_DEFAULT+= LAME FAAC AMR X264
.endif
.include <bsd.port.pre.mk>
+# for libexecinfo: (so that __builtin_frame_address() finds the top
+# of the stack)
+.if ${ARCH} == amd64
+CFLAGS+= -fno-omit-frame-pointer
+#MAKE_ENV+= ARCH=x86_64
+#CONFIGURE_ENV+= ARCH=x86_64
+.endif
# is this kosher? the result seems to run tho... (see ports/185997)
.if $(COMPILER_FEATURES:Mlibc++)

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 1, 10:41 PM (16 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29115683
Default Alt Text
D35151.diff (9 KB)

Event Timeline