fix conflict
This commit is contained in:
1 parent
b0cda5bf4a
commit
6668ccca20
3 files changed
+21
-22
No files matched your search
@@ -9,7 +9,7 @@ maintainer='akarsu'
|
|||||||
license=('BSD')
|
license=('BSD')
|
||||||
source=("https://code.videolan.org/rist/librist/-/archive/v$version/librist-v$version.tar.gz")
|
source=("https://code.videolan.org/rist/librist/-/archive/v$version/librist-v$version.tar.gz")
|
||||||
depends=()
|
depends=()
|
||||||
makedepends=(meson)
|
makedepends=(meson linux-headers cjson mbedtls)
|
||||||
md5sums=('7ac152a1ef28333abb706ce45948e4a3')
|
md5sums=('7ac152a1ef28333abb706ce45948e4a3')
|
||||||
group=(media.libs)
|
group=(media.libs)
|
||||||
uses=()
|
uses=()
|
||||||
|
|||||||
+19
-19
@@ -3,39 +3,39 @@ name='libsoxr'
|
|||||||
release='1'
|
release='1'
|
||||||
version='0.1.3'
|
version='0.1.3'
|
||||||
url='https://sourceforge.net/p/soxr/wiki/Home/'
|
url='https://sourceforge.net/p/soxr/wiki/Home/'
|
||||||
description='SoX Resampler library '
|
description='The SoX Resampler library that aims to give fast and high quality results for any constant resampling ratio'
|
||||||
email='bayramk@gmail.com'
|
email='akarsu@protonmail.com'
|
||||||
maintainer='bk'
|
maintainer='akarsu'
|
||||||
license=('GPLv3')
|
license=('GPL')
|
||||||
source=("https://downloads.sourceforge.net/project/soxr/soxr-$version-Source.tar.xz")
|
source=("https://downloads.sourceforge.net/project/soxr/soxr-${version}-Source.tar.xz")
|
||||||
depends=()
|
depends=()
|
||||||
makedepends=()
|
makedepends=(cmake ninja)
|
||||||
md5sums=('3f16f4dcb35b471682d4321eda6f6c08')
|
md5sums=('3f16f4dcb35b471682d4321eda6f6c08')
|
||||||
group=(media.libs)
|
group=(media.libs)
|
||||||
uses=()
|
uses=()
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
|
|
||||||
cd soxr-$version-Source
|
cd $name-$version
|
||||||
|
|
||||||
setup(){
|
setup(){
|
||||||
cmake -S . -B build -G Ninja \
|
cmake -S soxr-${version}-Source -B build -G Ninja \
|
||||||
-DCMAKE_BUILD_TYPE=None \
|
-DCMAKE_BUILD_TYPE=None \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
-DBUILD_EXAMPLES=OFF \
|
-DBUILD_EXAMPLES=OFF \
|
||||||
-DBUILD_SHARED_LIBS=ON \
|
-DBUILD_SHARED_LIBS=ON \
|
||||||
-DWITH_AVFFT=ON \
|
-DWITH_AVFFT=ON \
|
||||||
-DWITH_LSR_BINDINGS=ON \
|
-DWITH_LSR_BINDINGS=ON \
|
||||||
-DWITH_OPENMP=ON \
|
-DWITH_OPENMP=ON \
|
||||||
-DWITH_PFFFT=ON
|
-DWITH_PFFFT=ON
|
||||||
}
|
}
|
||||||
|
|
||||||
build(){
|
build(){
|
||||||
#make -j`nproc`
|
cmake --build build
|
||||||
cmake --build build
|
|
||||||
}
|
}
|
||||||
|
|
||||||
package(){
|
package(){
|
||||||
#make install -j`nproc`
|
|
||||||
cmake --install build
|
cmake --install build
|
||||||
|
rm -rf "${DESTDIR}"/usr/share/doc
|
||||||
|
install -Dm 644 soxr-${version}-Source/LICENCE -t "${DESTDIR}"/usr/share/licenses/libsoxr/
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@ email='akarsu@protonmail.com'
|
|||||||
maintainer='akarsu'
|
maintainer='akarsu'
|
||||||
license=('LGPL')
|
license=('LGPL')
|
||||||
source=("https://www.linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2")
|
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)
|
makedepends=(alsa-lib)
|
||||||
md5sums=('8ba9c73c4319b6afab5fa4358edc43de')
|
md5sums=('8ba9c73c4319b6afab5fa4358edc43de')
|
||||||
group=(media.libs)
|
group=(media.libs)
|
||||||
@@ -22,7 +22,6 @@ setup(){
|
|||||||
--libdir=/usr/lib64/ \
|
--libdir=/usr/lib64/ \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--sbindir=/usr/bin \
|
--sbindir=/usr/bin \
|
||||||
--disable-static
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build(){
|
build(){
|
||||||
|
|||||||
Reference in new issue
Block a user