fix conflict
This commit is contained in:
1 parent
10f14bd31c
commit
df816160f5
7 files changed
+14
-12
No files matched your search
@@ -8,8 +8,8 @@ email='akarsu@protonmail.com'
|
|||||||
maintainer='akarsu'
|
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=(cjson mbedtls)
|
||||||
makedepends=(meson linux-headers cjson mbedtls)
|
makedepends=(meson linux-headers)
|
||||||
md5sums=('7ac152a1ef28333abb706ce45948e4a3')
|
md5sums=('7ac152a1ef28333abb706ce45948e4a3')
|
||||||
group=(media.libs)
|
group=(media.libs)
|
||||||
uses=()
|
uses=()
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ email='akarsu@protonmail.com'
|
|||||||
maintainer='akarsu'
|
maintainer='akarsu'
|
||||||
license=('MPL2')
|
license=('MPL2')
|
||||||
source=("https://github.com/Haivision/srt/archive/v${version}.tar.gz")
|
source=("https://github.com/Haivision/srt/archive/v${version}.tar.gz")
|
||||||
depends=()
|
depends=(openssl)
|
||||||
makedepends=(cmake openssl linux-headers)
|
makedepends=(cmake linux-headers)
|
||||||
md5sums=('9d746de8bbc94ad327215d89801ac2fb')
|
md5sums=('9d746de8bbc94ad327215d89801ac2fb')
|
||||||
group=(media.libs)
|
group=(media.libs)
|
||||||
uses=()
|
uses=()
|
||||||
|
|||||||
@@ -7,10 +7,12 @@ description='An open video codec developed by the Xiph.org'
|
|||||||
email='akarsu@protonmail.com'
|
email='akarsu@protonmail.com'
|
||||||
maintainer='akarsu'
|
maintainer='akarsu'
|
||||||
license=('BSD')
|
license=('BSD')
|
||||||
source=("https://ftp.osuosl.org/pub/xiph/releases/theora/libtheora-${version}.tar.gz" "https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libtheora/files/libtheora-${version}-libpng16.patch")
|
source=("https://ftp.osuosl.org/pub/xiph/releases/theora/libtheora-${version}.tar.gz"
|
||||||
|
"https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libtheora/files/libtheora-${version}-libpng16.patch")
|
||||||
depends=(libogg)
|
depends=(libogg)
|
||||||
makedepends=(libvorbis)
|
makedepends=(libvorbis)
|
||||||
md5sums=('bb4dc37f0dc97db98333e7160bfbb52b' '21f74739583781b7f34b19f76b745831')
|
md5sums=('bb4dc37f0dc97db98333e7160bfbb52b'
|
||||||
|
'21f74739583781b7f34b19f76b745831')
|
||||||
group=(media.libs)
|
group=(media.libs)
|
||||||
uses=()
|
uses=()
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
@@ -23,8 +25,7 @@ setup(){
|
|||||||
#autoreconf -fvi
|
#autoreconf -fvi
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--libdir=/usr/lib64/ \
|
--libdir=/usr/lib64/ \
|
||||||
--enable-shared \
|
--enable-shared
|
||||||
--disable-static
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build(){
|
build(){
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ maintainer='akarsu'
|
|||||||
license=('BSD')
|
license=('BSD')
|
||||||
source=("https://downloads.xiph.org/releases/vorbis/libvorbis-${version}.tar.xz")
|
source=("https://downloads.xiph.org/releases/vorbis/libvorbis-${version}.tar.xz")
|
||||||
depends=(libogg)
|
depends=(libogg)
|
||||||
makedepends=(git)
|
makedepends=()
|
||||||
md5sums=('50902641d358135f06a8392e61c9ac77')
|
md5sums=('50902641d358135f06a8392e61c9ac77')
|
||||||
group=(media.libs)
|
group=(media.libs)
|
||||||
uses=()
|
uses=()
|
||||||
@@ -20,7 +20,6 @@ cd $name-$version
|
|||||||
setup(){
|
setup(){
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--libdir=/usr/lib64/ \
|
--libdir=/usr/lib64/ \
|
||||||
--disable-static \
|
|
||||||
--enable-shared
|
--enable-shared
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ setup(){
|
|||||||
--libdir=/usr/lib64/ \
|
--libdir=/usr/lib64/ \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--sbindir=/usr/bin \
|
--sbindir=/usr/bin \
|
||||||
|
--disable-qv4l2 \
|
||||||
|
--disable-qvidcap
|
||||||
}
|
}
|
||||||
|
|
||||||
build(){
|
build(){
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ email='akarsu@protonmail.com'
|
|||||||
maintainer='akarsu'
|
maintainer='akarsu'
|
||||||
license=('GPLv3')
|
license=('GPLv3')
|
||||||
source=("https://github.com/georgmartius/vid.stab/archive/v${version}/vid.stab-v${version}.tar.gz")
|
source=("https://github.com/georgmartius/vid.stab/archive/v${version}/vid.stab-v${version}.tar.gz")
|
||||||
depends=(glibc)
|
depends=()
|
||||||
makedepends=(cmake)
|
makedepends=(cmake)
|
||||||
md5sums=('3fb59a96f6e49e2719fd8c551eb3617a')
|
md5sums=('3fb59a96f6e49e2719fd8c551eb3617a')
|
||||||
group=(media.libs)
|
group=(media.libs)
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ email='akarsu@protonmail.com'
|
|||||||
maintainer='akarsu'
|
maintainer='akarsu'
|
||||||
license=('Apache')
|
license=('Apache')
|
||||||
source=("https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${version}.tar.gz")
|
source=("https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${version}.tar.gz")
|
||||||
depends=(glibc)
|
depends=()
|
||||||
makedepends=(cmake python)
|
makedepends=(cmake python)
|
||||||
md5sums=('7e1b09243447a0378a78dd5469b68415')
|
md5sums=('7e1b09243447a0378a78dd5469b68415')
|
||||||
group=(net.libs)
|
group=(net.libs)
|
||||||
|
|||||||
Reference in new issue
Block a user