diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-06-12 04:22:42 -0500 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:01 -0500 |
| commit | b05ce5add8948fa72697935d192aa78b5205cce4 (patch) | |
| tree | c2e85f9635c13e254ed7747714c3515b59f73477 | |
| parent | 741941bfad1b5a071bba76fd1e3a4df0e2ed5d95 (diff) | |
| download | packages-b05ce5add8948fa72697935d192aa78b5205cce4.tar.gz packages-b05ce5add8948fa72697935d192aa78b5205cce4.tar.bz2 packages-b05ce5add8948fa72697935d192aa78b5205cce4.tar.xz packages-b05ce5add8948fa72697935d192aa78b5205cce4.zip | |
user/mlt: Update to 7.6.0
| -rw-r--r-- | user/mlt/APKBUILD | 47 | ||||
| -rw-r--r-- | user/mlt/x86caps.patch | 37 |
2 files changed, 60 insertions, 24 deletions
diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD index db451478e..3843c8fa2 100644 --- a/user/mlt/APKBUILD +++ b/user/mlt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=mlt -pkgver=6.22.1 +pkgver=7.6.0 pkgrel=0 pkgdesc="MLT multimedia framework" url="https://www.mltframework.org/" @@ -9,41 +9,40 @@ arch="all" options="!check" # No test suite. license="LGPL-2.1+ AND GPL-3.0+" depends="" -makedepends="bsd-compat-headers ffmpeg-dev fftw-dev frei0r-plugins-dev +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 sox-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() { - _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="c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74 mlt-6.22.1.tar.gz -d00f01d50d5c78b1da5b43dc2b0bbfc49d5e383b602169ae9554734d29f6d43b9da8f97546141933c06ff0367bb4c9f0d2161bbcb6f016265bb0aa1dcbfcb3b1 mlt-6.14.0-locale-header.patch" +sha512sums="203ea7184e03246a8fcf7d284c7c7b26f57ab27867e97c43d9cf26c3906f6358f361d95593aa47abe79654106b934ffe997335304df967a40742ba060d2e4f38 mlt-7.6.0.tar.gz +d00f01d50d5c78b1da5b43dc2b0bbfc49d5e383b602169ae9554734d29f6d43b9da8f97546141933c06ff0367bb4c9f0d2161bbcb6f016265bb0aa1dcbfcb3b1 mlt-6.14.0-locale-header.patch +ffe5accab20caf612dc560ff0fa4b006af642df902902d8b2726342027bb4ea1bd4190b36291e124508d84a4878286862e66909d801639f44f47169d1fe65fec x86caps.patch" 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() |