diff options
| -rw-r--r-- | main/ffmpeg/APKBUILD | 5 | ||||
| -rw-r--r-- | testing/dkimproxy/dkimproxy.in.confd | 4 | ||||
| -rw-r--r-- | testing/dkimproxy/dkimproxy.out.confd | 4 | ||||
| -rw-r--r-- | testing/dkimproxy/dkimproxy.out.initd | 4 | ||||
| -rw-r--r-- | testing/vo-aacenc/APKBUILD | 42 |
5 files changed, 55 insertions, 4 deletions
diff --git a/main/ffmpeg/APKBUILD b/main/ffmpeg/APKBUILD index 33f5918fbd..ed8ede8fb2 100644 --- a/main/ffmpeg/APKBUILD +++ b/main/ffmpeg/APKBUILD @@ -9,8 +9,7 @@ license="GPL" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" makedepends="lame-dev libvorbis-dev faac-dev xvidcore-dev zlib-dev imlib2-dev x264-dev libtheora-dev coreutils bzip2-dev perl libvpx-dev - libvpx-dev sdl-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev - v4l-utils-dev" + libvpx-dev sdl-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev" depends= source="http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2 configure-dlvsym.patch" @@ -39,7 +38,6 @@ build() { --enable-libxvid \ --enable-libx264 \ --enable-libtheora \ - --enable-libv4l2 \ --enable-nonfree \ --enable-postproc \ --enable-pic \ @@ -76,4 +74,3 @@ md5sums="f66eee18559ba59da63b895164a189c3 ffmpeg-1.1.3.tar.bz2 sha256sums="a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 ffmpeg-1.1.3.tar.bz2 0854db61ec784935d77516ba9a467ba61e118f951149c07acb6887a6b417ac55 configure-dlvsym.patch" sha512sums="56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 ffmpeg-1.1.3.tar.bz2 -635c80ca801577439bd1cf8470fb760755c243e59adc8b4d9b8412f24e2dc336802afddde09f3d59443e29d92123d0308482be8ad32ab0f265c960315632636f configure-dlvsym.patch" diff --git a/testing/dkimproxy/dkimproxy.in.confd b/testing/dkimproxy/dkimproxy.in.confd index e10508a436..96017f2022 100644 --- a/testing/dkimproxy/dkimproxy.in.confd +++ b/testing/dkimproxy/dkimproxy.in.confd @@ -1,3 +1,7 @@ +<<<<<<< HEAD +OPTS="" +======= #OPTS="" +>>>>>>> c372a61b6ea8710b50e09bc8e12e8dc58a2e7dfa CONFIGFILE="/etc/dkimproxy/dkimproxy_in.conf" PIDFILE="/var/run/dkimproxy_in.pid" diff --git a/testing/dkimproxy/dkimproxy.out.confd b/testing/dkimproxy/dkimproxy.out.confd index 570b0bc078..b30c4ee2df 100644 --- a/testing/dkimproxy/dkimproxy.out.confd +++ b/testing/dkimproxy/dkimproxy.out.confd @@ -1,3 +1,7 @@ +<<<<<<< HEAD +OPTS="" +======= #OPTS="" +>>>>>>> c372a61b6ea8710b50e09bc8e12e8dc58a2e7dfa CONFIGFILE="/etc/dkimproxy/dkimproxy_out.conf" PIDFILE="/var/run/dkimproxy_out.pid" diff --git a/testing/dkimproxy/dkimproxy.out.initd b/testing/dkimproxy/dkimproxy.out.initd index ec1fba8869..d8ff15b360 100644 --- a/testing/dkimproxy/dkimproxy.out.initd +++ b/testing/dkimproxy/dkimproxy.out.initd @@ -1,6 +1,10 @@ #!/sbin/runscript +<<<<<<< HEAD +description="SMTP proxy that verifies signature on incoming messages" +======= description="SMTP proxy that verifies signature on outgoing messages" +>>>>>>> c372a61b6ea8710b50e09bc8e12e8dc58a2e7dfa depend() { need net diff --git a/testing/vo-aacenc/APKBUILD b/testing/vo-aacenc/APKBUILD new file mode 100644 index 0000000000..c353b0ed79 --- /dev/null +++ b/testing/vo-aacenc/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: Francesco Colista <francesco.colista@gmail.com> +# Maintainer: Francesco Colista <francesco.colista@gmail.com> +pkgname=vo-aacenc +pkgver=0.1.2 +pkgrel=0 +pkgdesc="VisualOn Advanced Audio Coding (AAC) encoder" +url="http://sourceforge.net/projects/opencore-amr/" +arch="all" +license="APACHE" +depends="" +depends_dev="" +makedepends="$depends_dev" +install="" +subpackages="$pkgname-dev" +source="http://downloads.sourceforge.net/opencore-amr/$pkgname-$pkgver.tar.gz" +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + ./configure --prefix=/usr \ + --enable-shared + make || return 1 +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir" install || return 1 + rm -f "$pkgdir"/usr/lib/*.la +} + +md5sums="cc862dce14ea5d688506904160c65a02 vo-aacenc-0.1.2.tar.gz" +sha256sums="d1911edba77f0406aa45ef630cdf340a4f35fd42e1d37a6e3ee01365d86f3959 vo-aacenc-0.1.2.tar.gz" +sha512sums="28eb60656738c205b3e7734b997691246b6786d4a11ff6ad32d6e2b512cc0c8ddaeec352f69bc7006923a9b66c90fb9b8679bb52d9954cb3152f4aa780051427 vo-aacenc-0.1.2.tar.gz" |