diff --git a/lang/go/files/patch-src_cmd_link_internal_ld_elf.go b/lang/go/files/patch-src_cmd_link_internal_ld_elf.go new file mode 100644 index 00000000..2e92eee9 --- /dev/null +++ b/lang/go/files/patch-src_cmd_link_internal_ld_elf.go @@ -0,0 +1,15 @@ +Backport https://go-review.googlesource.com/c/go/+/346872/ to go1.17 +--- src/cmd/link/internal/ld/elf.go.orig 2021-08-16 16:29:54 UTC ++++ src/cmd/link/internal/ld/elf.go +@@ -2028,6 +2028,11 @@ func asmbElf(ctxt *Link) { + ph := newElfPhdr() + ph.Type = elf.PT_SUNWSTACK + ph.Flags = elf.PF_W + elf.PF_R ++ } else if ctxt.HeadType == objabi.Hfreebsd { ++ ph := newElfPhdr() ++ ph.Type = elf.PT_GNU_STACK ++ ph.Flags = elf.PF_W + elf.PF_R ++ ph.Align = uint64(ctxt.Arch.RegSize) + } + + elfobj: diff --git a/math/lapack/files/patch-x-CMAKE-CheckLAPACKCompilerFlags.cmake b/math/lapack/files/patch-x-CMAKE-CheckLAPACKCompilerFlags.cmake new file mode 100644 index 00000000..52a3113b --- /dev/null +++ b/math/lapack/files/patch-x-CMAKE-CheckLAPACKCompilerFlags.cmake @@ -0,0 +1,11 @@ +--- ./CMAKE/CheckLAPACKCompilerFlags.cmake.orig 2011-03-06 22:02:06.000000000 +0200 ++++ ./CMAKE/CheckLAPACKCompilerFlags.cmake 2021-11-08 20:57:32.706803000 +0200 +@@ -16,7 +16,7 @@ + + # GNU Fortran + if( CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" ) +- if( "${CMAKE_Fortran_FLAGS}" MATCHES "-ffpe-trap=[izoupd]") ++ if( "${CMAKE_Fortran_FLAGS}" MATCHES "-fPIC -ffpe-trap=[izoupd]") + set( FPE_EXIT TRUE ) + endif() + diff --git a/math/octave/Makefile b/math/octave/Makefile new file mode 100644 index 00000000..ce55bf78 --- /dev/null +++ b/math/octave/Makefile @@ -0,0 +1,157 @@ +# Created by: chuckr@FreeBSD.org + +PORTNAME= octave +PORTVERSION= 6.3.0 +CATEGORIES= math +MASTER_SITES= GNU + +MAINTAINER= stephen@FreeBSD.org +COMMENT= High-level interactive language for numerical computations + + +CONFIGURE_ARGS+= --disable-java +CONFIGURE_ARGS+= --without-qt +CONFIGURE_ARGS+= --without-qscintilla + +LIB_DEPENDS+= libGLU.so:graph/libGLU +LIB_DEPENDS+= libGL.so:graph/libmesa +LIB_DEPENDS+= libX11.so:x11/libX11 +LIB_DEPENDS+= libcurl.so:net/libcurl +LIB_DEPENDS+= libdrm.so:system/libdrm +LIB_DEPENDS+= libexpat.so:text/libexpat +LIB_DEPENDS+= libfftw3.so:math/libfftw3 +LIB_DEPENDS+= libfontconfig.so:x11/libfontconfig +LIB_DEPENDS+= libfreetype.so:graph/libfreetype2 +LIB_DEPENDS+= libglapi.so:graph/libmesa +LIB_DEPENDS+= libiconv.so:text/libiconv +LIB_DEPENDS+= libnghttp2.so:net/libnghttp2 +LIB_DEPENDS+= libpcre.so:text/libpcre +LIB_DEPENDS+= libpng16.so:graph/libpng +LIB_DEPENDS+= libportaudio.so:media/libportaudio +LIB_DEPENDS+= libreadline.so:devel/libreadline +LIB_DEPENDS+= libsndfile.so:media/libsndfile + +#CONFIGURE_ARGS+= --with-qt=qt4 + +BUILD_DEPENDS+= ${LOCALBASE}/bin/gnuplot:math/gnuplot +BUILD_DEPENDS+= ${LOCALBASE}/bin/gsed:textproc/gsed +BUILD_DEPENDS+= ${LOCALBASE}/bin/makeinfo:print/texinfo +BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:devel/gperf + +RUN_DEPENDS+= ${LOCALBASE}/bin/gnuplot:math/gnuplot +RUN_DEPENDS+= ${LOCALBASE}/bin/gsed:textproc/gsed +RUN_DEPENDS+= ${LOCALBASE}/bin/makeinfo:print/texinfo + +#RUN_DEPENDS= gnuplot:math/gnuplot \ +# gsed:textproc/gsed \ +# ${LOCALBASE}/bin/makeinfo:print/texinfo +#LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick \ +# libarpack.so:math/arpack-ng \ +# libcurl.so:ftp/curl \ +# libfftw3.so:math/fftw3 \ +# libfftw3f.so:math/fftw3-float \ +# libfltk.so:x11-toolkits/fltk \ +# libftgl.so:graphics/ftgl \ +# libhdf5.so:science/hdf5 \ +# libpcre.so:devel/pcre \ +# libqhull.so.7:math/qhull \ +# libqrupdate.so:math/qrupdate \ +# libamd.so:math/suitesparse-amd \ +# libcamd.so:math/suitesparse-camd \ +# libccolamd.so:math/suitesparse-ccolamd \ +# libcholmod.so:math/suitesparse-cholmod \ +# libcolamd.so:math/suitesparse-colamd \ +# libsuitesparseconfig.so:math/suitesparse-config \ +# libcxsparse.so:math/suitesparse-cxsparse \ +# libklu.so:math/suitesparse-klu \ +# libumfpack.so:math/suitesparse-umfpack \ +# libglpk.so:math/glpk \ +# libgl2ps.so:print/gl2ps \ +# libfontconfig.so:x11-fonts/fontconfig \ +# libfreetype.so:print/freetype2 \ +# libdrm.so:graphics/libdrm \ +# libOSMesa.so:graphics/libosmesa \ +# libsundials_arkode.so:math/sundials \ +# libportaudio.so:audio/portaudio +## libsndfile.so:audio/libsndfile # Commented out until this port no longer has vulnerabilities. + + + +USES= charsetfix gmake perl5 pkgconfig tar:xz compiler:c++14-lang iconv +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}/${PORTVERSION} +USE_PERL5= build +GNU_CONFIGURE= yes +#USE_QT= core gui help network opengl \ +# qmake_build buildtools_build linguist_build \ +# printsupport sql widgets \ +# xml +#USE_XORG= x11 xext xfixes xft \ +# xcursor xinerama xrender +#USE_GL= gl glu + +MOC_QTVER=moc-qt4 +UIC_QTVER=uic-qt4 +RCC_QTVER=rcc-qt4 + + +OCTAVE_VERSION= ${PORTVERSION} +GNU_HOST= ${ARCH}-portbld-freebsd${OSREL} +PLIST_SUB= OCTAVE_VERSION=${OCTAVE_VERSION} GNU_HOST=${GNU_HOST} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +CONFIGURE_ENV+= GPERF="${LOCALBASE}/bin/gperf" +#CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME} +CONFIGURE_ENV+= MAKEINFO=${LOCALBASE}/bin/makeinfo +CONFIGURE_ENV+= MKINFO=${LOCALBASE}/bin/makeinfo + +CONFIGURE_ENV+= MOC_QTVER=${MOC} +CONFIGURE_ENV+= UIC_QTVER=${UIC} +CONFIGURE_ENV+= RCC_QTVER=${RCC} + +CONFIGURE_ENV+= LRELEASE_QTVER=${LRELEASE} +#CONFIGURE_ENV+= QCOLLECTIONGENERATOR_QTVER=${QCOLLECTIONGENERATOR} +#CONFIGURE_ENV+= QHELPGENERATOR_QTVER=${QHELPGENERATOR} +CONFIGURE_ENV+= ac_cv_type_max_align_t=yes +CONFIGURE_ENV+= ac_cv_path_SED=${LOCALBASE}/bin/gsed + +CONFIGURE_ARGS+= --host=${GNU_HOST} +#CONFIGURE_ARGS+= --with-blas="-L${LOCALBASE}/lib ${BLASLIB}" +#CONFIGURE_ARGS+= --with-lapack="${LAPACKLIB}" +CONFIGURE_ARGS+= --enable-shared +CONFIGURE_ARGS+= --disable-jit +CONFIGURE_ARGS+= --disable-openmp +#CONFIGURE_ARGS+= --with-osmesa + +#INFO= octave liboctave + +INSTALL_TARGET= install-strip + +#OPTIONS_DEFINE= DOCS JAVA QT5 + +#OPTIONS_RADIO= BLAS +#OPTIONS_RADIO_BLAS= OPENBLAS NETLIB ATLAS +#OPTIONS_DEFAULT= JAVA OPENBLAS QT5 +#OPTIONS_SUB= yes + +#DOCS_CONFIGURE_ENABLE= docs +#JAVA_CONFIGURE_ENABLE= java +#QT5_CONFIGURE_WITH= qt=5 qscintilla + +#QT5_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 + +#DOCS_USE= TEX=dvipsk:build,formats:build +#JAVA_USE= JAVA=yes +#QT5_USES= qt:5 +#OPENBLAS_USES= blaslapack:openblas +#NETLIB_USES= blaslapack:netlib +#ATLAS_USES= blaslapack:atlas + +post-patch: + ${REINPLACE_CMD} 's|"makeinfo"|"${LOCALBASE}/bin/makeinfo"|' ${WRKSRC}/libinterp/corefcn/help.cc + ${REINPLACE_CMD} 's|"-qt=$$qt_version"|"-qt=qt$$qt_version"|' ${WRKSRC}/configure + +#post-install: +# cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib . + + +.include diff --git a/math/octave/distinfo b/math/octave/distinfo new file mode 100644 index 00000000..16e68960 --- /dev/null +++ b/math/octave/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1626389174 +SHA256 (octave-6.3.0.tar.xz) = fb472cb957c748670391cbc3385ff230cf44832bc314fee359e43c69cf9da5ef +SIZE (octave-6.3.0.tar.xz) = 25330580 diff --git a/math/octave/files/patch-build-aux_find-defun-files.sh b/math/octave/files/patch-build-aux_find-defun-files.sh new file mode 100644 index 00000000..d0b23b1b --- /dev/null +++ b/math/octave/files/patch-build-aux_find-defun-files.sh @@ -0,0 +1,11 @@ +--- build-aux/find-defun-files.sh.orig 2020-11-26 18:20:44 UTC ++++ build-aux/find-defun-files.sh +@@ -27,7 +27,7 @@ + + set -e + +-SED=${SED:-sed} ++SED=gsed + EGREP=${EGREP:-egrep} + + # Some stupid egreps don't like empty elements in alternation patterns, diff --git a/math/octave/files/patch-build-aux_find-files-with-tests.sh b/math/octave/files/patch-build-aux_find-files-with-tests.sh new file mode 100644 index 00000000..8acb71cb --- /dev/null +++ b/math/octave/files/patch-build-aux_find-files-with-tests.sh @@ -0,0 +1,11 @@ +--- build-aux/find-files-with-tests.sh.orig 2020-11-26 18:20:44 UTC ++++ build-aux/find-files-with-tests.sh +@@ -28,7 +28,7 @@ + set -e + + GREP=${GREP:-grep} +-SED=${SED:-sed} ++SED=gsed + + srcdir="$1" + if [ "$1" ]; then diff --git a/math/octave/files/patch-build-aux_mk-octave-config-h.sh b/math/octave/files/patch-build-aux_mk-octave-config-h.sh new file mode 100644 index 00000000..2f679a1e --- /dev/null +++ b/math/octave/files/patch-build-aux_mk-octave-config-h.sh @@ -0,0 +1,11 @@ +--- build-aux/mk-octave-config-h.sh.orig 2020-11-26 18:20:44 UTC ++++ build-aux/mk-octave-config-h.sh +@@ -29,7 +29,7 @@ + # autoconf-generated config.h file. See the notes at the top of the + # generated octave-config.h file for more details. + +-SED=${SED:-sed} ++SED=gsed + + if [ $# -ne 1 ]; then + echo "usage: mk-octave-config-h.sh CONFIG-FILE" 1>&2 diff --git a/math/octave/files/patch-configure b/math/octave/files/patch-configure new file mode 100644 index 00000000..c5a23986 --- /dev/null +++ b/math/octave/files/patch-configure @@ -0,0 +1,16 @@ +--- configure.orig 2020-11-26 18:20:44 UTC ++++ configure +@@ -83764,6 +83764,13 @@ $as_echo_n "checking for include file ... " >&6 + JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/darwin" + fi + ;; ++ freebsd*) ++ if test -n "$JAVA_CPPFLAGS"; then ++ JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS} -I${JAVA_CPPFLAGS}/freebsd" ++ else ++ JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd" ++ fi ++ ;; + *) + if test -n "$JAVA_CPPFLAGS"; then + JAVA_CPPFLAGS="-I${JAVA_CPPFLAGS} -I${JAVA_CPPFLAGS}/linux" diff --git a/math/octave/files/patch-libgnu_math.in.h b/math/octave/files/patch-libgnu_math.in.h new file mode 100644 index 00000000..077b7d10 --- /dev/null +++ b/math/octave/files/patch-libgnu_math.in.h @@ -0,0 +1,11 @@ +--- libgnu/math.in.h.orig 2020-11-26 18:20:44 UTC ++++ libgnu/math.in.h +@@ -15,7 +15,7 @@ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +-#ifndef _@GUARD_PREFIX@_MATH_H ++#if 1 + + #if __GNUC__ >= 3 + @PRAGMA_SYSTEM_HEADER@ diff --git a/math/octave/files/patch-libinterp_corefcn_sysdep.cc b/math/octave/files/patch-libinterp_corefcn_sysdep.cc new file mode 100644 index 00000000..2dd96ec8 --- /dev/null +++ b/math/octave/files/patch-libinterp_corefcn_sysdep.cc @@ -0,0 +1,13 @@ +--- libinterp/corefcn/sysdep.cc.orig 2020-11-26 18:20:44 UTC ++++ libinterp/corefcn/sysdep.cc +@@ -61,6 +61,10 @@ + # include + #endif + ++#if defined (__FreeBSD__) && defined(__arm__) ++#include ++#endif ++ + #include "cmd-edit.h" + #include "file-ops.h" + #include "lo-mappers.h" diff --git a/math/octave/files/patch-scripts_pkg_private_configure__make.m b/math/octave/files/patch-scripts_pkg_private_configure__make.m new file mode 100644 index 00000000..d6eba6e8 --- /dev/null +++ b/math/octave/files/patch-scripts_pkg_private_configure__make.m @@ -0,0 +1,11 @@ +--- scripts/pkg/private/configure_make.m.orig 2019-02-23 17:33:37 UTC ++++ scripts/pkg/private/configure_make.m +@@ -91,7 +91,7 @@ function configure_make (desc, packdir, verbose) + endif + + if (exist (fullfile (src, "Makefile"), "file")) +- [status, output] = shell (sprintf ("%s make --jobs %i --directory '%s'", ++ [status, output] = shell (sprintf ("%s gmake --jobs %i --directory '%s'", + scenv, jobs, src), verbose); + if (status != 0) + rmdir (desc.dir, "s"); diff --git a/math/octave/files/patch-x-Makefile.in b/math/octave/files/patch-x-Makefile.in new file mode 100644 index 00000000..ae03119b --- /dev/null +++ b/math/octave/files/patch-x-Makefile.in @@ -0,0 +1,60 @@ +--- ./Makefile.in.orig 2021-11-09 14:21:12.667740000 +0200 ++++ ./Makefile.in 2021-11-09 14:19:00.608707000 +0200 +@@ -290,7 +290,7 @@ + + @AMCOND_BUILD_QT_GUI_TRUE@am__append_35 = src/octave-gui \ + @AMCOND_BUILD_QT_GUI_TRUE@ src/octave-svgconvert +-@AMCOND_BUILD_QT_GUI_TRUE@am__append_36 = src/octave-gui-$(version)$(EXEEXT) ++@AMCOND_BUILD_QT_GUI_TRUE@am__append_36 = src/octave-gui$(EXEEXT) + @AMCOND_BUILD_QT_GUI_TRUE@am__append_37 = src/octave-gui$(EXEEXT) \ + @AMCOND_BUILD_QT_GUI_TRUE@ src/octave-svgconvert$(EXEEXT) + @AMCOND_CROSS_TOOLS_TRUE@am__append_38 = src/$(host_triplet)-mkoctfile$(BUILD_EXEEXT) \ +@@ -6053,7 +6053,7 @@ + $(am__append_6) $(am__append_14) $(am__append_18) \ + src/display-available.h src/shared-fcns.h + nodist_noinst_HEADERS = +-OCTAVE_VERSION_LINKS = src/octave-cli-$(version)$(EXEEXT) \ ++OCTAVE_VERSION_LINKS = src/octave-cli$(EXEEXT) \ + $(am__append_36) + OCTAVE_CROSS_TOOLS = $(am__append_38) + OCTAVE_INTERPRETER_TARGETS = $(LIBOCTAVE_TST_FILES) \ +@@ -30891,31 +30891,17 @@ + src/octave-build-info.cc: src/octave-build-info.in.cc HG-ID | src/$(octave_dirstamp) + $(AM_V_GEN)$(build-info-commands) + +-install-exec-hook: make-version-links ++install-exec-hook: + +-uninstall-local: remove-version-links ++uninstall-local: + +-make-version-links: +- cd $(DESTDIR)$(bindir) && \ +- for f in $(notdir $(basename $(bin_PROGRAMS))); do \ +- mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \ +- $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \ +- done ++#src/octave-cli-$(version)$(EXEEXT): src/octave-cli$(EXEEXT) ++# $(AM_V_GEN)rm -f $@ && \ ++# cd $(@D) && $(LN_S) $(&5 + $as_echo "defining localveroctfiledir to be $localveroctfiledir" >&6; } + +@@ -8460,7 +8460,7 @@ + + ## Where to install Octave's include files. + +- : ${octincludedir='${includedir}/octave-${version}/octave'} ++ : ${octincludedir='${includedir}/octave'} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octincludedir to be $octincludedir" >&5 + $as_echo "defining octincludedir to be $octincludedir" >&6; } + +@@ -8470,7 +8470,7 @@ + ## This includes the Octave version, so that the function files for different + ## versions of Octave will be installed in separate directories. + +- : ${fcnfiledir='${datadir}/octave/${version}/m'} ++ : ${fcnfiledir='${datadir}/octave/m'} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining fcnfiledir to be $fcnfiledir" >&5 + $as_echo "defining fcnfiledir to be $fcnfiledir" >&6; } + +@@ -8494,7 +8494,7 @@ + + + +- : ${localverfcnfiledir='${datadir}/octave/${version}/site/m'} ++ : ${localverfcnfiledir='${datadir}/octave/site/m'} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localverfcnfiledir to be $localverfcnfiledir" >&5 + $as_echo "defining localverfcnfiledir to be $localverfcnfiledir" >&6; } + +@@ -8502,7 +8502,7 @@ + + ## Where to install extra files like NEWS and doc-cache. + +- : ${octetcdir='${datadir}/octave/${version}/etc'} ++ : ${octetcdir='${datadir}/octave/etc'} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octetcdir to be $octetcdir" >&5 + $as_echo "defining octetcdir to be $octetcdir" >&6; } + +@@ -8510,7 +8510,7 @@ + + ## Where to install the language files for the GUI. + +- : ${octlocaledir='${datadir}/octave/${version}/locale'} ++ : ${octlocaledir='${datadir}/octave/locale'} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octlocaledir to be $octlocaledir" >&5 + $as_echo "defining octlocaledir to be $octlocaledir" >&6; } + +@@ -8542,7 +8542,7 @@ + + ## Where Octave will search to find image files. + +- : ${imagedir='${datadir}/octave/${version}/imagelib'} ++ : ${imagedir='${datadir}/octave/imagelib'} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining imagedir to be $imagedir" >&5 + $as_echo "defining imagedir to be $imagedir" >&6; } + +@@ -8550,7 +8550,7 @@ + + ## Where Octave will search for example data files shipped with distribution. + +- : ${octdatadir='${datadir}/octave/${version}/data'} ++ : ${octdatadir='${datadir}/octave/data'} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octdatadir to be $octdatadir" >&5 + $as_echo "defining octdatadir to be $octdatadir" >&6; } + +@@ -8558,7 +8558,7 @@ + + ## Where Octave will search for Qt help files shipped with distribution. + +- : ${octdocdir='${datadir}/octave/${version}/doc'} ++ : ${octdocdir='${datadir}/octave/doc'} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octdocdir to be $octdocdir" >&5 + $as_echo "defining octdocdir to be $octdocdir" >&6; } + +@@ -8566,7 +8566,7 @@ + + ## Where Octave will search for fallback font files shipped with distribution. + +- : ${octfontsdir='${datadir}/octave/${version}/fonts'} ++ : ${octfontsdir='${datadir}/octave/fonts'} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octfontsdir to be $octfontsdir" >&5 + $as_echo "defining octfontsdir to be $octfontsdir" >&6; } + diff --git a/math/octave/files/patch-x-src-main.in.cc b/math/octave/files/patch-x-src-main.in.cc new file mode 100644 index 00000000..aacbd960 --- /dev/null +++ b/math/octave/files/patch-x-src-main.in.cc @@ -0,0 +1,11 @@ +--- ./src/main.in.cc.orig 2021-07-11 19:19:32.000000000 +0200 ++++ ./src/main.in.cc 2021-11-09 15:51:49.309926000 +0200 +@@ -220,7 +220,7 @@ + std::string octave_bindir = get_octave_bindir (); + std::string octave_archlibdir = get_octave_archlibdir (); + std::string octave_cli +- = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION; ++ = octave_bindir + dir_sep_char + "octave-cli"; + std::string octave_gui = octave_archlibdir + dir_sep_char + "octave-gui"; + + #if defined (HAVE_OCTAVE_QT_GUI) diff --git a/math/octave/files/patch-x-src-module.mk b/math/octave/files/patch-x-src-module.mk new file mode 100644 index 00000000..3d0fe97b --- /dev/null +++ b/math/octave/files/patch-x-src-module.mk @@ -0,0 +1,60 @@ +--- ./src/module.mk.orig 2021-07-11 19:19:32.000000000 +0200 ++++ ./src/module.mk 2021-11-08 21:43:06.436194000 +0200 +@@ -203,34 +203,34 @@ + + ALL_LOCAL_TARGETS += $(OCTAVE_CROSS_TOOLS) + +-install-exec-hook: make-version-links ++#install-exec-hook: make-version-links ++# ++#uninstall-local: remove-version-links ++# ++#make-version-links: ++# cd $(DESTDIR)$(bindir) && \ ++# for f in $(notdir $(basename $(bin_PROGRAMS))); do \ ++# mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \ ++# $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \ ++# done ++# ++#remove-version-links: ++# for f in $(notdir $(basename $(bin_PROGRAMS))); do \ ++# rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \ ++# done ++# ++#.PHONY: make-version-links remove-version-links + +-uninstall-local: remove-version-links +- +-make-version-links: +- cd $(DESTDIR)$(bindir) && \ +- for f in $(notdir $(basename $(bin_PROGRAMS))); do \ +- mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \ +- $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \ +- done +- +-remove-version-links: +- for f in $(notdir $(basename $(bin_PROGRAMS))); do \ +- rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \ +- done +- +-.PHONY: make-version-links remove-version-links +- + ## We need these filenames in the build tree because the wrapper + ## program (main.cc) will try to invoke the versioned binaries. + +-%reldir%/octave-cli-$(version)$(EXEEXT): %reldir%/octave-cli$(EXEEXT) +- $(AM_V_GEN)rm -f $@ && \ +- cd $(@D) && $(LN_S) $( ${WRKDIR}/${PORTNAME}.desktop + ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}.desktop" "${STAGEDIR}${DESKTOPDIR}" +.endif +.if ${PORT_OPTIONS:MQT4} + @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \ + -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|qt4|g" \ + < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}_qt4.desktop + ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}_qt4.desktop" "${STAGEDIR}${DESKTOPDIR}" +.endif +.endif + +.include diff --git a/xapp/avidemux/Makefile.common b/xapp/avidemux/Makefile.common new file mode 100644 index 00000000..0a314c60 --- /dev/null +++ b/xapp/avidemux/Makefile.common @@ -0,0 +1,285 @@ +# $FreeBSD$ + +PORTREVISION?= 2 +AVIDEMUX_VERSION= 2.6.11 +MASTER_SITES= \ + SF/avidemux/avidemux/${PORTVERSION} +DISTNAME= avidemux_${PORTVERSION} + +BUILD_DEPENDS+= yasm:devel/yasm \ + bash:shells/bash +LIB_DEPENDS+= libmad.so:audio/libmad \ + libdca.so:multimedia/libdca \ + libpng.so:graphics/png + +LICENSE= GPLv2 + +USE_GNOME= libxml2 +USE_QT4= # empty + +OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME:C/-.*//}/options + +USES= cmake:outsource,noninja pkgconfig iconv gmake compiler:features sqlite +USES+= dos2unix +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+= -DQT5:BOOL=OFF +CXXFLAGS+= -I${LOCALBASE}/include +MAKE_JOBS_UNSAFE= yes +NOPRECIOUSMAKEVARS= yes # ARCH + +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin + +OPTIONS_DEFINE= QT4 CLI FREETYPE FONTCONFIG OSS ESOUND JACK \ + PULSEAUDIO XVIDEO FAAC FRIBIDI OPUS TWOLAME \ + FAAD X264 X265 VPX XVID SDL AMR VORBIS NLS LAME VAAPI VDPAU +OPTIONS_DEFAULT= QT4 FREETYPE FONTCONFIG OSS XVIDEO VPX XVID \ + SDL FAAD VDPAU VORBIS +OPTIONS_SUB= yes +CLI_DESC= Build CLI tool + +FRIBIDI_CMAKE_OFF= -DFRIDIBI:BOOL=OFF +FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi +OPUS_CMAKE_OFF= -DOPUS:BOOL=OFF +OPUS_LIB_DEPENDS= libopus.so:audio/opus +TWOLAME_CMAKE_OFF= -DTWOLAME:BOOL=OFF +TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame + +.if !defined(PACKAGE_BUILDING) +OPTIONS_DEFAULT+= LAME FAAC AMR X264 +.endif + +.include + +.if ${PORT_OPTIONS:MNLS} +USES+= gettext +PLIST_SUB+= NLS="" +. if ${PORT_OPTIONS:MQT4} +PLIST_SUB+= QT_NLS="" +. else +PLIST_SUB+= QT_NLS="@comment " +. endif +.else +CMAKE_ARGS+= -DNO_NLS:BOOL=ON +PLIST_SUB+= NLS="@comment " QT_NLS="@comment " +.endif + +# 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 + +# We haven't ALSA(Never) & Aften(Yet) on FreeBSD +CMAKE_ARGS+= -DARTS:BOOL=OFF -DALSA:BOOL=OFF -DAFTEN:BOOL=OFF + +.if empty(PORT_OPTIONS:MGTK3) && empty(PORT_OPTIONS:MQT4) +CMAKE_ARGS+= -DX11:BOOL=OFF +.else +USE_GNOME+= libxslt +.endif + +.if ${PORT_OPTIONS:MGTK3} +USE_GNOME+= gnomeprefix gtk30 +PLIST_SUB+= GTK="" +.else +CMAKE_ARGS+= -DGTK:BOOL=OFF +PLIST_SUB+= GTK="@comment " +.endif + +.if ${PORT_OPTIONS:MQT4} +USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build gui +PLIST_SUB+= QT4="" +.else +CMAKE_ARGS+= -DQT4:BOOL=OFF +PLIST_SUB+= QT4="@comment " +.endif + +.if ${PORT_OPTIONS:MCLI} +PLIST_SUB+= CLI="" +.else +PLIST_SUB+= CLI="@comment " +.endif + +.if ${PORT_OPTIONS:MOSS} +CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=ON +.else +CMAKE_ARGS+= -DOSS_SUPPORT:BOOL=OFF +.endif + +.if ${PORT_OPTIONS:MESOUND} +USE_GNOME+= esound +PLIST_SUB+= ESD="" +.else +CMAKE_ARGS+= -DESD:BOOL=OFF +PLIST_SUB+= ESD="@comment " +.endif + +.if ${PORT_OPTIONS:MJACK} +LIB_DEPENDS+= libjack.so:audio/jack +PLIST_SUB+= JACK="" +.else +CMAKE_ARGS+= -DJACK:BOOL=OFF +PLIST_SUB+= JACK="@comment " +.endif + +.if ${PORT_OPTIONS:MPULSEAUDIO} +LIB_DEPENDS+= libpulse.so:audio/pulseaudio +PLIST_SUB+= PULSE="" +.else +CMAKE_ARGS+= -DPULSEAUDIOSIMPLE:BOOL=OFF +PLIST_SUB+= PULSE="@comment " +.endif + +.if ${PORT_OPTIONS:MFREETYPE} +LIB_DEPENDS+= libfreetype.so:print/freetype2 +PLIST_SUB+= FREETYPE="" +.else +CMAKE_ARGS+= -DFREETYPE2:BOOL=OFF +PLIST_SUB+= FREETYPE="@comment " +.endif + +.if ${PORT_OPTIONS:MFONTCONFIG} +LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig +.else +CMAKE_ARGS+= -DFONTCONFIG:BOOL=OFF +.endif + +.if ${PORT_OPTIONS:MXVIDEO} +#LIB_DEPENDS+= Xv:x11/libXv +USE_XORG+= xv +.else +CMAKE_ARGS+= -DXVIDEO:BOOL=OFF +.endif + +.if ${PORT_OPTIONS:MFAAC} +LIB_DEPENDS+= libfaac.so:audio/faac +PLIST_SUB+= FAAC="" +.else +CMAKE_ARGS+= -DFAAC:BOOL=OFF +PLIST_SUB+= FAAC="@comment " +.endif + +.if ${PORT_OPTIONS:MLAME} +LIB_DEPENDS+= libmp3lame.so:audio/lame +PLIST_SUB+= LAME="" +.else +CMAKE_ARGS+= -DLAME:BOOL=OFF +PLIST_SUB+= LAME="@comment " +.endif + +.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 +PLIST_SUB+= VPX="@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:MSDL} +USE_SDL= sdl +PLIST_SUB+= SDL="" +.else +CMAKE_ARGS+= -DSDL:BOOL=OFF +PLIST_SUB+= SDL="@comment " +.endif + +.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 + +.if ${PORT_OPTIONS:MVDPAU} +LIB_DEPENDS+= libvdpau.so:multimedia/libvdpau +PLIST_SUB+= VDPAU="" +.else +CMAKE_ARGS+= -DVDPAU:BOOL=OFF +PLIST_SUB+= VDPAU="@comment " +.endif + +.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 + +.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 " +.endif + +.include + +# is this kosher? the result seems to run tho... (see ports/185997) +.if $(COMPILER_FEATURES:Mlibc++) +LDFLAGS+= -lc++ +.endif + +#.if ${COMPILER_TYPE} == clang +USE_GCC= yes +#.endif + +.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" +BROKEN= Does not compile on ia64, powerpc, or sparc64 +.endif + +post-patch: + @${MKDIR} ${CONFIGURE_WRKSRC}/config + @${LN} -s ${LOCALBASE}/include/iconv.h ${CONFIGURE_WRKSRC}/config + @${REINPLACE_CMD} 's|-ldl||' ${WRKSRC}/avidemux_core/CMakeLists.txt + +post-configure-common: + @${FIND} ${CONFIGURE_WRKSRC} -name link.txt -print0 | \ + ${XARGS} -0 ${REINPLACE_CMD} 's|-ldl||g' diff --git a/xapp/avidemux/distinfo b/xapp/avidemux/distinfo new file mode 100644 index 00000000..750531a8 --- /dev/null +++ b/xapp/avidemux/distinfo @@ -0,0 +1,2 @@ +SHA256 (avidemux_2.6.11.tar.gz) = 936ff5e10ad0551460c1233c217e4cee642623f2899a8fe48cd7f0144cfd1b3a +SIZE (avidemux_2.6.11.tar.gz) = 17980757 diff --git a/xapp/avidemux/files/avidemux2.desktop.in b/xapp/avidemux/files/avidemux2.desktop.in new file mode 100644 index 00000000..d827f766 --- /dev/null +++ b/xapp/avidemux/files/avidemux2.desktop.in @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=%%NAME%%-%%API%% +GenericName[ru]=Видеоредактор +Comment=Video Editor +Comment[ru]=Видеоредактор +Exec=%%PREFIX%%/bin/%%NAME%%_%%API%% +MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2; +Icon=%%DATADIR%%/%%NAME%%.png +Terminal=false +Type=Application +Categories=Application;AudioVideo;AudioVideoEditing; diff --git a/xapp/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h b/xapp/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h new file mode 100644 index 00000000..e6f3392b --- /dev/null +++ b/xapp/avidemux/files/patch-avidemux__core_ADM__coreUtils_src_prefs2__pref.h @@ -0,0 +1,11 @@ +--- avidemux_core/ADM_coreUtils/src/prefs2_pref.h.orig 2016-01-29 08:47:25 UTC ++++ avidemux_core/ADM_coreUtils/src/prefs2_pref.h +@@ -19,7 +19,7 @@ static optionDesc myOptions[]={ + { FEATURES_REUSE_2PASS_LOG,"features.reuse_2pass_log" ,ADM_param_bool ,"0", 0, 1}, + { FEATURES_AUDIOBAR_USES_MASTER,"features.audiobar_uses_master" ,ADM_param_bool ,"0", 0, 1}, + { FEATURES_THREADING_LAVC,"features.threading_lavc" ,ADM_param_uint32_t ,"0", 0, 32}, +-{ FEATURES_CPU_CAPS,"features.cpu_caps" ,ADM_param_uint32_t ,"4294967295", 0, 4294967295}, ++{ FEATURES_CPU_CAPS,"features.cpu_caps" ,ADM_param_uint32_t ,"4294967295", 0, static_cast(4294967295)}, + { FEATURES_MPEG_NO_LIMIT,"features.mpeg_no_limit" ,ADM_param_bool ,"0", 0, 1}, + { FEATURES_ALTERNATE_MP3_TAG,"features.alternate_mp3_tag" ,ADM_param_bool ,"1", 0, 1}, + { FEATURES_VDPAU,"features.vdpau" ,ADM_param_bool ,"0", 0, 1}, diff --git a/xapp/avidemux/files/patch-avidemux__core_ADM__coreVideoCodec_include_ADM__ffmp43.h b/xapp/avidemux/files/patch-avidemux__core_ADM__coreVideoCodec_include_ADM__ffmp43.h new file mode 100644 index 00000000..4ad14865 --- /dev/null +++ b/xapp/avidemux/files/patch-avidemux__core_ADM__coreVideoCodec_include_ADM__ffmp43.h @@ -0,0 +1,28 @@ +--- avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h.orig 2017-05-21 11:18:35 UTC ++++ avidemux_core/ADM_coreVideoCodec/include/ADM_ffmp43.h +@@ -180,7 +180,7 @@ ADM_COREVIDEOCODEC6_EXPORT void ADM_lavD + #define WRAP_Open_Template(funcz,argz,display,codecid,extra) \ + {\ + AVCodec *codec=funcz(argz);\ +-if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \ ++if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \ + codecId=codecid; \ + _context = avcodec_alloc_context3 (codec);\ + ADM_assert (_context);\ +@@ -210,13 +210,13 @@ if(!codec) {GUI_Error_HIG("Codec",QT_TR_ + \ + if (avcodec_open2(_context, codec, NULL) < 0) \ + { \ +- printf("[lavc] Decoder init: "display" video decoder failed!\n"); \ +- GUI_Error_HIG("Codec","Internal error opening "display); \ ++ printf("[lavc] Decoder init: " display " video decoder failed!\n"); \ ++ GUI_Error_HIG("Codec","Internal error opening " display); \ + ADM_assert(0); \ + } \ + else \ + { \ +- printf("[lavc] Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \ ++ printf("[lavc] Decoder init: " display " video decoder initialized! (%s)\n",codec->long_name); \ + } \ + } + diff --git a/xapp/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp b/xapp/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp new file mode 100644 index 00000000..044843cc --- /dev/null +++ b/xapp/avidemux/files/patch-avidemux__core_ADM__core_src_ADM__memsupport.cpp @@ -0,0 +1,20 @@ +--- avidemux_core/ADM_core/src/ADM_memsupport.cpp.orig 2015-05-15 09:19:29 UTC ++++ avidemux_core/ADM_core/src/ADM_memsupport.cpp +@@ -23,7 +23,7 @@ + * (at your option) any later version. * + * * + ***************************************************************************/ +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + #include + #endif + #include "ADM_default.h" +@@ -79,7 +79,7 @@ void ADM_dezalloc(void *ptr) + + ADM_aligned_free(ptr); + } +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) + void *ADM_aligned_alloc(size_t size) + { + return malloc(size); diff --git a/xapp/avidemux/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff b/xapp/avidemux/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff new file mode 100644 index 00000000..f27ec3b7 --- /dev/null +++ b/xapp/avidemux/files/patch-avidemux__core_ffmpeg__package_patches_config.mak.diff @@ -0,0 +1,14 @@ +--- avidemux_core/ffmpeg_package/patches/config.mak.diff.orig 2015-05-15 09:19:29 UTC ++++ avidemux_core/ffmpeg_package/patches/config.mak.diff +@@ -1,6 +1,8 @@ +---- config.mak 2011-09-29 06:10:57 UTC +-+++ config.mak 2011-09-29 06:11:44.896423943 +0000 +-@@ -59,7 +59,7 @@ ++--- config.mak.orig +++++ config.mak ++@@ -93,7 +93,7 @@ ++ EXEOBJS= ++ INSTALL=install + LIBTARGET= + -SLIBNAME=$(SLIBPREF)$(FULLNAME)$(SLIBSUF) + +SLIBNAME=$(SLIBPREF)ADM6$(FULLNAME)$(SLIBSUF) diff --git a/xapp/avidemux/files/patch-avidemux__plugins_CMakeLists.txt b/xapp/avidemux/files/patch-avidemux__plugins_CMakeLists.txt new file mode 100644 index 00000000..7ad4f749 --- /dev/null +++ b/xapp/avidemux/files/patch-avidemux__plugins_CMakeLists.txt @@ -0,0 +1,10 @@ +--- avidemux_plugins/CMakeLists.txt.orig 2016-01-31 19:06:53 UTC ++++ avidemux_plugins/CMakeLists.txt +@@ -203,7 +203,6 @@ ADD_SUBDIRECTORY(ADM_videoEncoder) + ADD_SUBDIRECTORY(ADM_videoFilters6) + IF(DO_QT4) + add_subdirectory(ADM_demuxers/VapourSynth) +- add_subdirectory(ADM_scriptEngines) + #IF(USE_OPENGL AND NOT WIN32) + IF(USE_OPENGL ) + ADD_SUBDIRECTORY(ADM_videoFilters6_openGl) diff --git a/xapp/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch b/xapp/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch new file mode 100644 index 00000000..180e8709 --- /dev/null +++ b/xapp/avidemux/files/patch-avidemux_core-ffmpeg_package-patches-configure.patch @@ -0,0 +1,19 @@ +--- avidemux_core/ffmpeg_package/patches/configure.patch.orig 2015-06-01 05:59:45 UTC ++++ avidemux_core/ffmpeg_package/patches/configure.patch +@@ -0,0 +1,16 @@ ++--- configure.orig 2015-03-16 20:26:04.000000000 +0100 +++++ configure ++@@ -2733,12 +2733,7 @@ ++ host_os=$target_os_default ++ ++ # machine ++-if test "$target_os_default" = aix; then ++- arch_default=$(uname -p) ++- strip_default="strip -X32_64" ++-else ++- arch_default=$(uname -m) ++-fi +++arch_default=$(uname -p) ++ cpu="generic" ++ intrinsics="none" ++ diff --git a/xapp/avidemux/files/patch-avidemux_qt4_ADM__jobs_src_ADM__jobControl.cpp b/xapp/avidemux/files/patch-avidemux_qt4_ADM__jobs_src_ADM__jobControl.cpp new file mode 100644 index 00000000..a9ad7bdc --- /dev/null +++ b/xapp/avidemux/files/patch-avidemux_qt4_ADM__jobs_src_ADM__jobControl.cpp @@ -0,0 +1,11 @@ +--- avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp.orig 2016-01-29 08:47:25 UTC ++++ avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp +@@ -112,7 +112,7 @@ void jobWindow::refreshList(void) + QTableWidgetItem *endItem=fromText (end,i); + QTableWidgetItem *durItem=fromText (dur,i); + +-#define MX(x,y) case ADM_JOB_##x: status->setIcon(QIcon(":/jobs/"y));break; ++#define MX(x,y) case ADM_JOB_##x: status->setIcon(QIcon(":/jobs/" y));break; + switch(listOfJob[i].status) + { + MX(KO,"gtk-no.png"); diff --git a/xapp/avidemux/files/patch-cmake_admCheckMiscLibs.cmake b/xapp/avidemux/files/patch-cmake_admCheckMiscLibs.cmake new file mode 100644 index 00000000..2f1debdd --- /dev/null +++ b/xapp/avidemux/files/patch-cmake_admCheckMiscLibs.cmake @@ -0,0 +1,11 @@ +--- cmake/admCheckMiscLibs.cmake.orig 2015-05-30 14:09:29 UTC ++++ cmake/admCheckMiscLibs.cmake +@@ -67,7 +67,7 @@ ENDIF (UNIX AND NOT APPLE) + MESSAGE(STATUS "Checking for execinfo") + MESSAGE(STATUS "*********************") + +-FIND_HEADER_AND_LIB(execinfo execinfo.h execinfo backtrace_symbols) ++FIND_HEADER_AND_LIB(EXECINFO execinfo.h execinfo backtrace_symbols) + PRINT_LIBRARY_INFO("execinfo" EXECINFO_FOUND "${LIBEXECINFO_INCLUDE_DIR}" "${LIBEXECINFO_LIBRARY_DIR}") + + IF (LIBEXECINFO_INCLUDE_DIR) diff --git a/xapp/avidemux/files/patch-cmake_admCheckX265.cmake b/xapp/avidemux/files/patch-cmake_admCheckX265.cmake new file mode 100644 index 00000000..77c23fab --- /dev/null +++ b/xapp/avidemux/files/patch-cmake_admCheckX265.cmake @@ -0,0 +1,12 @@ +--- cmake/admCheckX265.cmake.orig 2016-01-29 08:47:25 UTC ++++ cmake/admCheckX265.cmake +@@ -19,9 +19,6 @@ MACRO(checkX265) + MESSAGE("WARNING: x265 core version is too old. At least version 9 is required.") + SET(X265_FOUND 0) + ELSE (x265_version LESS 9) +- IF(NOT WIN32) +- SET(DL dl) +- ENDIF(NOT WIN32) + FIND_HEADER_AND_LIB(X265 x265.h x265 x265_encoder_open_${x265_version} ${DL}) + ENDIF (x265_version LESS 9) + ELSE (_X265_FOUND AND _X265_CONFIG_FOUND) diff --git a/xapp/avidemux/pkg-descr b/xapp/avidemux/pkg-descr new file mode 100644 index 00000000..2c3aa4b1 --- /dev/null +++ b/xapp/avidemux/pkg-descr @@ -0,0 +1,8 @@ +A video editor that allows editing of AVI, OGM, and MPEG videos. The MPEG +support provides the ability to convert to DVD compliat PS streams. It +contains various filters for deinterlacing, cropping, resizing, etc. Allows +for cutting without re-encoding. Has the ability to re-encode and re-sample. +Utilizes ECMAScript (aka. Javascript) to provide batch scripting and +processing support. + +WWW: http://avidemux.org/ diff --git a/xapp/avidemux/pkg-plist b/xapp/avidemux/pkg-plist new file mode 100644 index 00000000..00c73bf5 --- /dev/null +++ b/xapp/avidemux/pkg-plist @@ -0,0 +1,70 @@ +@mode 0755 +lib/libADM6avcodec.so.56 +lib/libADM6avformat.so.56 +lib/libADM6avutil.so.54 +lib/libADM6postproc.so.53 +lib/libADM6swscale.so.3 +@mode +lib/libADM_core6.so +lib/libADM_coreAudio6.so +lib/libADM_coreImage6.so +%%VAAPI%%lib/libADM_coreLibVA6.so +lib/libADM_coreUI6.so +lib/libADM_audioParser6.so +lib/libADM_coreAudioDevice6.so +lib/libADM_coreAudioEncoder6.so +lib/libADM_coreAudioFilterAPI6.so +lib/libADM_coreDemuxer6.so +lib/libADM_coreDemuxerMpeg6.so +lib/libADM_coreImageLoader6.so +lib/libADM_coreJobs.so +lib/libADM_coreMuxer6.so +lib/libADM_coreScript.so +lib/libADM_coreSocket6.so +lib/libADM_coreSqlLight3.so +lib/libADM_coreSubtitle.so +lib/libADM_coreUtils6.so +%%VDPAU%%lib/libADM_coreVDPAU6.so +lib/libADM_coreVideoCodec6.so +lib/libADM_coreVideoEncoder6.so +lib/libADM_coreVideoFilter6.so +include/avidemux/2.6/libavutil/buffer.h +include/avidemux/2.6/libavutil/attributes.h +include/avidemux/2.6/libavutil/audioconvert.h +include/avidemux/2.6/libavutil/avconfig.h +include/avidemux/2.6/libavutil/avutil.h +include/avidemux/2.6/libavutil/bswap.h +include/avidemux/2.6/libavutil/channel_layout.h +include/avidemux/2.6/libavutil/common.h +include/avidemux/2.6/libavutil/cpu.h +include/avidemux/2.6/libavutil/dict.h +include/avidemux/2.6/libavutil/error.h +include/avidemux/2.6/libavutil/frame.h +include/avidemux/2.6/libavutil/intfloat.h +include/avidemux/2.6/libavutil/log.h +include/avidemux/2.6/libavutil/macros.h +include/avidemux/2.6/libavutil/mathematics.h +include/avidemux/2.6/libavutil/mem.h +include/avidemux/2.6/libavutil/old_pix_fmts.h +include/avidemux/2.6/libavutil/opt.h +include/avidemux/2.6/libavutil/pixfmt.h +include/avidemux/2.6/libavutil/rational.h +include/avidemux/2.6/libavutil/samplefmt.h +include/avidemux/2.6/libavutil/time.h +include/avidemux/2.6/libavutil/version.h +include/avidemux/2.6/libavcodec/avcodec.h +%%VAAPI%%include/avidemux/2.6/libavcodec/vaapi.h +%%VAAPI%%include/avidemux/2.6/libavcodec/vaapi_internal.h +include/avidemux/2.6/libavcodec/vdpau.h +include/avidemux/2.6/libavcodec/version.h +include/avidemux/2.6/libavcodec/old_codec_ids.h +include/avidemux/2.6/libavformat/avformat.h +include/avidemux/2.6/libavformat/avio.h +include/avidemux/2.6/libavformat/version.h +include/avidemux/2.6/libavformat/flv.h +include/avidemux/2.6/libpostproc/postprocess.h +include/avidemux/2.6/libpostproc/version.h +include/avidemux/2.6/libswscale/swscale.h +include/avidemux/2.6/libswscale/version.h +include/avidemux/2.6/ADM_coreConfig.h +include/avidemux/2.6/ADM_coreConfig.cmake diff --git a/xapp/pidgin/Makefile~ b/xapp/pidgin/Makefile~ deleted file mode 100644 index 4b72cde2..00000000 --- a/xapp/pidgin/Makefile~ +++ /dev/null @@ -1,93 +0,0 @@ -# -# $Id$ -# -PORTNAME= pidgin -PORTVERSION= 2.14.4 -CATEGORIES?= net -MASTER_SITES= http://downloads.sourceforge.net/project/pidgin/Pidgin/${PORTVERSION}/ - -MAINTAINER= onborodin@gmail.com -COMMENT= Pidgin multi-protocol messaging client (GTK+ UI) - - -LIB_DEPENDS+= libgnutls.so:crypto/libgnutls -LIB_DEPENDS+= libglib.so:devel/libglib -LIB_DEPENDS+= libgmp.so:math/libgmp -LIB_DEPENDS+= libgtkspell.so:gnome/libgtkspell -LIB_DEPENDS+= libidn.so:net/libidn -LIB_DEPENDS+= libenchant.so:text/libenchant -LIB_DEPENDS+= libgtk-x11.so:gnome/libgtk2 -LIB_DEPENDS+= libavahi-glib.so:net/avahi -LIB_DEPENDS+= libdbus-glib.so:xfce/libdbus-glib -LIB_DEPENDS+= libpango.so:gnome/libpango -LIB_DEPENDS+= libxml2.so:text/libxml2 -LIB_DEPENDS+= libstartup-notification.so:xfce/libstartup-notification - - -RUN_DEPENDS+= gtk-update-icon-cache:gnome/libgtk2 -RUN_DEPENDS+= update-desktop-database:xfce/desktop-file-utils -RUN_DEPENDS+= gconftool:gnome/gconf2 - - -GNU_CONFIGURE= yes -USES+= tar:bzip2 -USES+= gmake - -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+= --mandir=${PREFIX}/man -CONFIGURE_ARGS+= --disable-gstreamer -CONFIGURE_ARGS+= --disable-cap -CONFIGURE_ARGS+= --disable-consoleui -CONFIGURE_ARGS+= --disable-meanwhile -CONFIGURE_ARGS+= --disable-nm -CONFIGURE_ARGS+= --disable-perl -CONFIGURE_ARGS+= --disable-screensaver -CONFIGURE_ARGS+= --disable-tcl -CONFIGURE_ARGS+= --disable-tk -CONFIGURE_ARGS+= --disable-vv -CONFIGURE_ARGS+= --enable-avahi -CONFIGURE_ARGS+= --enable-dbus -CONFIGURE_ARGS+= --enable-gtkspell -CONFIGURE_ARGS+= --enable-nss=no -CONFIGURE_ARGS+= --enable-startup-notification -CONFIGURE_ARGS+= --with-avahi-client-includes=${LOCALBASE}/include -CONFIGURE_ARGS+= --with-avahi-client-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-nspr-includes=${LOCALBASE}/include/nspr -CONFIGURE_ARGS+= --with-nspr-libs=${LOCALBASE}/lib -CONFIGURE_ARGS+= --without-zephyr -MAKE_ARGS+= program_transform_name="" -INSTALLS_SHLIB= yes - -FILES+= ${WRKSRC}/configure -FILES+= ${WRKSRC}/Makefile.in -FILES+= ${WRKSRC}/*/Makefile.in -FILES+= ${WRKSRC}/*/*/Makefile.in -FILES+= ${WRKSRC}/*/*/*/Makefile.in -FILES+= ${WRKSRC}/libpurple/data/*.pc.in -FILES+= ${WRKSRC}/pidgin/data/*.pc.in - -post-patch: - ${REINPLACE_CMD} -e 's,gio-2.0,gio,g' ${FILES} - ${REINPLACE_CMD} -e 's,gio-unix-2.0,gio-unix,g' ${FILES} - ${REINPLACE_CMD} -e 's,glib-2.0,glib,g' ${FILES} - ${REINPLACE_CMD} -e 's,gmodule-2.0,gmodule,g' ${FILES} - ${REINPLACE_CMD} -e 's,gobject-2.0,gobject,g' ${FILES} - ${REINPLACE_CMD} -e 's,gthread-2.0,gthread,g' ${FILES} - ${REINPLACE_CMD} -e 's,gtk+-2.0,gtk+,g' ${FILES} - ${REINPLACE_CMD} -e 's,gtkspell-2.0,gtkspell,g' ${FILES} - ${REINPLACE_CMD} -e 's,libxml-2.0,libxml2,g' ${FILES} - ${REINPLACE_CMD} -e 's,dbus-1,dbus,g' ${FILES} - ${REINPLACE_CMD} -e 's,dbus-glib-1,dbus-glib,g' ${FILES} - ${REINPLACE_CMD} -e 's,libstartup-notification-1.0,libstartup-notification,g' ${FILES} - ${REINPLACE_CMD} -e 's,-@PURPLE_MAJOR_VERSION@,,g' ${FILES} - ${REINPLACE_CMD} -e 's,-$$(PURPLE_MAJOR_VERSION),,g' ${FILES} - ${REINPLACE_CMD} -e 's,-$$PURPLE_MAJOR_VERSION,,g' ${FILES} - - -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGINSTALL= ${WRKDIR}/pkg-install -SUB_FILES+= pkg-install pkg-deinstall - -.include -#EOF diff --git a/xapp/pidgin/files/_patch-configure b/xapp/pidgin/files/_patch-configure new file mode 100644 index 00000000..22bc0eea --- /dev/null +++ b/xapp/pidgin/files/_patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2014-12-02 11:21:18.056424694 -0500 ++++ configure 2014-12-02 11:21:43.067421364 -0500 +@@ -17452,7 +17452,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5 + $as_echo "$ac_cv_lib_ncursesw_initscr" >&6; } + if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then : +- GNT_LIBS="-lncursesw" ++ GNT_LIBS="-lncursesw -ltinfow" + else + enable_consoleui=no + fi