diff options
Diffstat (limited to 'user/mlt')
| -rw-r--r-- | user/mlt/APKBUILD | 51 | ||||
| -rw-r--r-- | user/mlt/mlt-6.14.0-locale-header.patch | 12 | ||||
| -rw-r--r-- | user/mlt/x86caps.patch | 37 |
3 files changed, 62 insertions, 38 deletions
diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD index ad94dd2ff..e592a1f0e 100644 --- a/user/mlt/APKBUILD +++ b/user/mlt/APKBUILD @@ -1,47 +1,46 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=mlt -pkgver=6.16.0 +pkgver=7.12.0 pkgrel=0 pkgdesc="MLT multimedia framework" url="https://www.mltframework.org/" arch="all" options="!check" # No test suite. license="LGPL-2.1+ AND GPL-3.0+" -makedepends="bsd-compat-headers ffmpeg-dev fftw-dev frei0r-plugins-dev +depends="" +makedepends="bsd-compat-headers cmake ffmpeg-dev fftw-dev frei0r-plugins-dev gtk+2.0-dev libexif-dev libsamplerate-dev libxml2-dev sdl-dev sdl2-dev - qt5-qtbase-dev qt5-qtsvg-dev sdl_image-dev sox-dev" -subpackages="$pkgname-dev" + libvorbis-dev qt5-qtbase-dev qt5-qtsvg-dev sdl_image-dev + alsa-lib-dev ladspa-dev pulseaudio-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/mltframework/mlt/releases/download/v$pkgver/mlt-$pkgver.tar.gz - mlt-6.14.0-locale-header.patch + x86caps.patch " build() { - local _maybe_asm="" - case $CTARGET_ARCH in - pmmx) _maybe_asm="--disable-sse --target-arch=i586" ;; + ppc) export LDFLAGS="$LDFLAGS -latomic" ;; esac - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --avformat-swscale \ - --enable-motion-est \ - --enable-gpl \ - --enable-gpl3 \ - --disable-rtaudio \ - $_maybe_asm - make + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake -Bbuild \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make -C build } package() { - make DESTDIR="$pkgdir" install + make -C build DESTDIR="$pkgdir" install } -sha512sums="554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26 mlt-6.16.0.tar.gz -d00f01d50d5c78b1da5b43dc2b0bbfc49d5e383b602169ae9554734d29f6d43b9da8f97546141933c06ff0367bb4c9f0d2161bbcb6f016265bb0aa1dcbfcb3b1 mlt-6.14.0-locale-header.patch" +sha512sums="7111ca31f5ed8479dc899596bec4b9dd9440ab8563844abd9d789f7ce342b61c54d1a5058d6f5288fdd510db7e05db12f7e807bf0cd33dbee11a72185fb0b746 mlt-7.12.0.tar.gz +ffe5accab20caf612dc560ff0fa4b006af642df902902d8b2726342027bb4ea1bd4190b36291e124508d84a4878286862e66909d801639f44f47169d1fe65fec x86caps.patch" diff --git a/user/mlt/mlt-6.14.0-locale-header.patch b/user/mlt/mlt-6.14.0-locale-header.patch deleted file mode 100644 index 28d659460..000000000 --- a/user/mlt/mlt-6.14.0-locale-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurd mlt-6.14.0/src/framework/mlt_property.h mlt-6.14.0.new/src/framework/mlt_property.h ---- mlt-6.14.0/src/framework/mlt_property.h 2019-03-30 15:59:21.000000000 -0500 -+++ mlt-6.14.0.new/src/framework/mlt_property.h 2019-04-07 11:44:33.645881649 -0500 -@@ -30,7 +30,7 @@ - #include <sys/param.h> - #endif - --#if (defined(__GLIBC__) && !defined(__APPLE__)) || defined(HAVE_LOCALE_H) -+#if (defined(__linux__) && !defined(__APPLE__)) || defined(HAVE_LOCALE_H) - # include <locale.h> - #elif defined(__APPLE__) || (defined(__FreeBSD_version) && __FreeBSD_version >= 900506) - # include <xlocale.h> diff --git a/user/mlt/x86caps.patch b/user/mlt/x86caps.patch new file mode 100644 index 000000000..4b8e3ae0b --- /dev/null +++ b/user/mlt/x86caps.patch @@ -0,0 +1,37 @@ +--- mlt-7.6.0/CMakeLists.txt.old 2022-03-29 13:12:42.000000000 -0500 ++++ mlt-7.6.0/CMakeLists.txt 2022-06-12 04:00:05.290000000 -0500 +@@ -125,10 +125,8 @@ + if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang") + if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|x86|x86_64|AMD64") + set(CPU_MMX ON) +- set(CPU_SSE ON) +- set(CPU_SSE2 ON) + if(NOT MSVC) # also NOT clang-cl +- list(APPEND MLT_COMPILE_OPTIONS "-mmmx;-msse;-msse2") ++ list(APPEND MLT_COMPILE_OPTIONS "-mmmx") + endif() + endif() + if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686" OR (WIN32 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86")) +@@ -136,6 +134,9 @@ + endif() + if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64") + set(CPU_X86_64 ON) ++ set(CPU_SSE ON) ++ set(CPU_SSE2 ON) ++ set(CPU_SSE3 ON) + endif() + endif() + +--- mlt-7.6.0/src/modules/xine/CMakeLists.txt.old 2022-03-29 13:12:42.000000000 -0500 ++++ mlt-7.6.0/src/modules/xine/CMakeLists.txt 2022-06-12 03:59:39.880000000 -0500 +@@ -30,6 +30,10 @@ + target_compile_definitions(mltxine PRIVATE USE_SSE2) + endif() + ++if(CPU_SSE3) ++ target_compile_definitions(mltxine PRIVATE USE_SSE3) ++endif() ++ + if(CPU_X86_32) + target_compile_definitions(mltxine PRIVATE ARCH_X86) + endif() |