Date: Mon, 24 Jul 2017 12:41:10 +0200
From: Natanael Copa <ncopa@alpinelinux.org>
To: Taner Tas <taner76@gmail.com>
Cc: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH v2 1/2] unmaintained/vdr: Takeover,
 update, improve and modernize package
Message-ID: <20170724124110.46a2ce0f@ncopa-desktop.copa.dup.pw>
In-Reply-To: <20170711070009.4053-1-taner76@gmail.com>
References: <20170710204508.10684-1-taner76@gmail.com>
	<20170711070009.4053-1-taner76@gmail.com>
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Tue, 11 Jul 2017 07:00:08 +0000
Taner Tas <taner76@gmail.com> wrote:

> ---
>  unmaintained/vdr/APKBUILD                  | 121 +++++++++++++------
>  unmaintained/vdr/Make.config               |   1 +
>  unmaintained/vdr/musl-compat.patch         | 181 +++++++++++------------------
>  unmaintained/vdr/softhddevice-musl.patch   |  19 +++
>  unmaintained/vdr/streamdev-for-2.3.7.patch |  46 ++++++++
>  5 files changed, 218 insertions(+), 150 deletions(-)
>  create mode 100644 unmaintained/vdr/softhddevice-musl.patch
>  create mode 100644 unmaintained/vdr/streamdev-for-2.3.7.patch
> 
> diff --git a/unmaintained/vdr/APKBUILD b/unmaintained/vdr/APKBUILD
> index 9fde5bd9..09376e27 100644
> --- a/unmaintained/vdr/APKBUILD
> +++ b/unmaintained/vdr/APKBUILD
> @@ -1,52 +1,103 @@
>  # Contributor: Carlo Landmeter <clandmeter@gmail.com>
> -# Maintainer:
> +# Maintainer: Taner Tas <taner76@gmail.com>
>  pkgname=vdr
> -pkgver=2.1.6
> -pkgrel=0
> -pkgdesc="Video Disk Recorde"
> +pkgver=2.3.8
> +pkgrel=1

We start with pkgrel 0 and not 1 as arch linux
Not critical though.

> +pkgdesc="Video Disk Recorder"
>  url="http://www.tvdr.de/"
>  arch="all"
>  license="GPL2"
>  depends=""
> -depends_dev="fontconfig-dev freetype-dev gettext-dev libjpeg-turbo-dev
> -	fribidi-dev libcap-dev"
> -makedepends="$depends_dev perl coreutils"
> -install=""
> -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
> -source="http://projects.vdr-developer.org/git/vdr.git/snapshot/vdr-2.1.6.tar.bz2
> +depends_dev="libexecinfo-dev fontconfig-dev freetype-dev gettext-dev libjpeg-turbo-dev fribidi-dev
> +	libcap-dev alsa-lib-dev libvdpau-dev libva-dev libx11-dev xcb-util-dev xcb-util-wm-dev
> +	ffmpeg-dev libcdio-dev mpv"
> +makedepends="$depends_dev coreutils"
> +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-softhddevice $pkgname-femon $pkgname-mpv"
> +options="!check"
> +
> +_femon_ver=28e4fb8de8578a1b8a36eb38d2e710dc60be7e3f
> +_softhddevice_ver=9c90c5afbd85a113781a7d8fb10e7d68a109c698
> +_mpv_ver=87543f7058b88a3ace8550551bb3982cc304720e
> +_vnsiserver_ver=2c42df3cf1ba37184e9106091f383ea6009490da
> +_streamdev_ver=b84b7d858cf4f6f3473ba72d456326c048946cb0
> +
> +source="ftp://ftp.tvdr.de/vdr/Developer/vdr-${pkgver}.tar.bz2
> +	vdr-plugin-femon-${_femon_ver}.tar.gz::https://github.com/rofafor/vdr-plugin-femon/archive/${_femon_ver}.tar.gz
> +	vdr-plugin-softhddevice-${_softhddevice_ver}.tar.gz::https://github.com/rofafor/vdr-plugin-softhddevice/archive/${_softhddevice_ver}.tar.gz
> +	vdr-plugin-mpv-${_mpv_ver}.tar.gz::https://github.com/chriszero/vdr-plugin-mpv/archive/${_mpv_ver}.tar.gz
> +	vdr-plugin-vnsiserver-${_vnsiserver_ver}.tar.gz::https://github.com/FernetMenta/vdr-plugin-vnsiserver/archive/${_vnsiserver_ver}.tar.gz
> +	vdr-plugin-streamdev-${_streamdev_ver}.tar.gz::https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-${_streamdev_ver}.tar.gz
>  	musl-compat.patch
> +	softhddevice-musl.patch
> +	streamdev-for-2.3.7.patch
>  	Make.config"
>  
> -_builddir="$srcdir/$pkgname-$pkgver"
> +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
> +	rm -rf ${builddir}/PLUGINS/src/skincurses
> +	cp -aP $srcdir/vdr-plugin-femon-${_femon_ver} ${builddir}/PLUGINS/src/femon
> +	cp -aP $srcdir/vdr-plugin-softhddevice-${_softhddevice_ver} ${builddir}/PLUGINS/src/softhddevice
> +	cp -aP $srcdir/vdr-plugin-mpv-${_mpv_ver} ${builddir}/PLUGINS/src/mpv
> +	cp -aP $srcdir/vdr-plugin-vnsiserver-${_vnsiserver_ver} ${builddir}/PLUGINS/src/vnsiserver
> +	cp -aP $srcdir/vdr-plugin-streamdev-${_streamdev_ver} ${builddir}/PLUGINS/src/streamdev
> +	cd "$builddir"
> +	default_prepare
>  }
>  
>  build() {
> -	cd "$_builddir"
> -	cp $srcdir/Make.config \
> -		$_builddir || return 1
> -	make || return 1
> +	cd "$builddir"
> +	cp $srcdir/Make.config $builddir
> +	make
> +}
> +
> +softhddevice() {
> +	depends="${pkgname} alsa-lib libvdpau libva ffmpeg-libs"

you don't need alsa-lib, libvdpau, libva or ffmpeg-libs. abuild will
automatically create a so:<library> dependency for those.

I think we should also set explicit version for the vdr dependency, so
the subbackages requires exact version of vdr as itself.

The same applies for the other subpackages and I have fixed it for you.

Thanks!


-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---