From 6668ccca207e85aa455f4d88a43412c5b0b93800 Mon Sep 17 00:00:00 2001
From: aliriza <aliriza.keskin@pardus.org.tr>
Date: Mon, 10 Apr 2023 07:04:16 +0000
Subject: [PATCH] fix conflict

---
 media/libs/librist/ympbuild   |  2 +-
 media/libs/libsoxr/ympbuild   | 38 +++++++++++++++++------------------
 media/libs/v4l-utils/ympbuild |  3 +--
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/media/libs/librist/ympbuild b/media/libs/librist/ympbuild
index 528e32e8..7b1eb3fc 100644
--- a/media/libs/librist/ympbuild
+++ b/media/libs/librist/ympbuild
@@ -9,7 +9,7 @@ maintainer='akarsu'
 license=('BSD')
 source=("https://code.videolan.org/rist/librist/-/archive/v$version/librist-v$version.tar.gz")
 depends=()
-makedepends=(meson)
+makedepends=(meson linux-headers cjson mbedtls)
 md5sums=('7ac152a1ef28333abb706ce45948e4a3')
 group=(media.libs)
 uses=()
diff --git a/media/libs/libsoxr/ympbuild b/media/libs/libsoxr/ympbuild
index 780f2a96..48a061ea 100644
--- a/media/libs/libsoxr/ympbuild
+++ b/media/libs/libsoxr/ympbuild
@@ -3,39 +3,39 @@ name='libsoxr'
 release='1'
 version='0.1.3'
 url='https://sourceforge.net/p/soxr/wiki/Home/'
-description='SoX Resampler library '
-email='bayramk@gmail.com'
-maintainer='bk'
-license=('GPLv3')
-source=("https://downloads.sourceforge.net/project/soxr/soxr-$version-Source.tar.xz")
+description='The SoX Resampler library that aims to give fast and high quality results for any constant resampling ratio'
+email='akarsu@protonmail.com'
+maintainer='akarsu'
+license=('GPL')
+source=("https://downloads.sourceforge.net/project/soxr/soxr-${version}-Source.tar.xz")
 depends=()
-makedepends=()
+makedepends=(cmake ninja)
 md5sums=('3f16f4dcb35b471682d4321eda6f6c08')
 group=(media.libs)
 uses=()
 arch=('x86_64')
 
-cd soxr-$version-Source
+cd $name-$version
 
 setup(){
-cmake -S . -B build -G Ninja \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_EXAMPLES=OFF \
-    -DBUILD_SHARED_LIBS=ON \
-    -DWITH_AVFFT=ON \
-    -DWITH_LSR_BINDINGS=ON \
-    -DWITH_OPENMP=ON \
-    -DWITH_PFFFT=ON
+    cmake -S soxr-${version}-Source -B build -G Ninja \
+        -DCMAKE_BUILD_TYPE=None \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DBUILD_EXAMPLES=OFF \
+        -DBUILD_SHARED_LIBS=ON \
+        -DWITH_AVFFT=ON \
+        -DWITH_LSR_BINDINGS=ON \
+        -DWITH_OPENMP=ON \
+        -DWITH_PFFFT=ON
 }
 
 build(){
-    #make -j`nproc`
-        cmake --build build
+    cmake --build build
 }
 
 package(){
-    #make install -j`nproc`
     cmake --install build
+    rm -rf "${DESTDIR}"/usr/share/doc
+    install -Dm 644 soxr-${version}-Source/LICENCE -t "${DESTDIR}"/usr/share/licenses/libsoxr/
 }
 
diff --git a/media/libs/v4l-utils/ympbuild b/media/libs/v4l-utils/ympbuild
index 3fd594fb..287d135c 100644
--- a/media/libs/v4l-utils/ympbuild
+++ b/media/libs/v4l-utils/ympbuild
@@ -8,7 +8,7 @@ email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('LGPL')
 source=("https://www.linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2")
-depends=(libjpeg-turbo)
+depends=(hicolor-icon-theme libjpeg-turbo sysfsutils)
 makedepends=(alsa-lib)
 md5sums=('8ba9c73c4319b6afab5fa4358edc43de')
 group=(media.libs)
@@ -22,7 +22,6 @@ setup(){
         --libdir=/usr/lib64/ \
         --sysconfdir=/etc \
         --sbindir=/usr/bin \
-        --disable-static 
 }
 
 build(){