libdvdcss: drop libtool file, plus minor and/or cosmetic fixes.

Also pass --add-missing to automake to allow building on secondary
architectures.
This commit is contained in:
fbrosson
2016-09-13 21:57:46 +00:00
parent 1ef194a36e
commit ec5b063003
3 changed files with 46 additions and 23 deletions

View File

@@ -4,19 +4,18 @@ block device without having to bother about the decryption."
HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html" HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
COPYRIGHT="1998-2013 VideoLAN" COPYRIGHT="1998-2013 VideoLAN"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="1" REVISION="2"
SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2" SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2"
CHECKSUM_SHA256="84f1bba6cfef1df87f774fceaefc8e73c4cda32e8f6700b224ad0acb5511ba2c" CHECKSUM_SHA256="84f1bba6cfef1df87f774fceaefc8e73c4cda32e8f6700b224ad0acb5511ba2c"
SOURCE_DIR="libdvdcss-${portVersion}" SOURCE_DIR="libdvdcss-$portVersion"
PATCHES="libdvdcss-${portVersion}.patch" PATCHES="libdvdcss-$portVersion.patch"
ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc" ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES=" PROVIDES="
libdvdcss$secondaryArchSuffix = $portVersion libdvdcss$secondaryArchSuffix = $portVersion
lib:libdvdcss$secondaryArchSuffix lib:libdvdcss$secondaryArchSuffix = 2.1.0 compat >= 2
cmd:dvdcss_config$secondaryArchSuffix
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
@@ -24,7 +23,7 @@ REQUIRES="
PROVIDES_devel=" PROVIDES_devel="
libdvdcss${secondaryArchSuffix}_devel = $portVersion libdvdcss${secondaryArchSuffix}_devel = $portVersion
devel:libdvdcss$secondaryArchSuffix = $portVersion devel:libdvdcss$secondaryArchSuffix = 2.1.0 compat >= 2
" "
REQUIRES_devel=" REQUIRES_devel="
libdvdcss$secondaryArchSuffix == $portVersion base libdvdcss$secondaryArchSuffix == $portVersion base
@@ -37,7 +36,7 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix cmd:ld$secondaryArchSuffix
cmd:make cmd:make
cmd:libtoolize cmd:libtoolize$secondaryArchSuffix
cmd:aclocal cmd:aclocal
cmd:autoconf cmd:autoconf
" "
@@ -47,7 +46,7 @@ BUILD()
libtoolize --force --copy --install libtoolize --force --copy --install
aclocal aclocal
autoconf autoconf
automake automake --add-missing
runConfigure ./configure runConfigure ./configure
make make
} }
@@ -56,10 +55,18 @@ INSTALL()
{ {
make install make install
# remove libtool file
rm $libDir/libdvdcss.la
# prepare develop/lib # prepare develop/lib
prepareInstalledDevelLibs libdvdcss prepareInstalledDevelLib libdvdcss
fixPkgconfig fixPkgconfig
packageEntries devel \ packageEntries devel \
$developDir $developDir
} }
TEST()
{
make check
}

View File

@@ -4,14 +4,14 @@ block device without having to bother about the decryption."
HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html" HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
COPYRIGHT="1998-2014 VideoLAN" COPYRIGHT="1998-2014 VideoLAN"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="1" REVISION="2"
SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2" SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2"
CHECKSUM_SHA256="7c414acd520c4e4dd7267952f72d738ff50321a7869af4d75c65aefad44f1395" CHECKSUM_SHA256="7c414acd520c4e4dd7267952f72d738ff50321a7869af4d75c65aefad44f1395"
SOURCE_DIR="libdvdcss-${portVersion}" SOURCE_DIR="libdvdcss-$portVersion"
PATCHES="libdvdcss-${portVersion}.patchset" PATCHES="libdvdcss-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc" ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES=" PROVIDES="
libdvdcss$secondaryArchSuffix = $portVersion libdvdcss$secondaryArchSuffix = $portVersion
@@ -36,7 +36,7 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix cmd:ld$secondaryArchSuffix
cmd:make cmd:make
cmd:libtoolize cmd:libtoolize$secondaryArchSuffix
cmd:aclocal cmd:aclocal
cmd:autoconf cmd:autoconf
" "
@@ -46,7 +46,7 @@ BUILD()
libtoolize --force --copy --install libtoolize --force --copy --install
aclocal aclocal
autoconf autoconf
automake automake --add-missing
runConfigure ./configure runConfigure ./configure
make make
} }
@@ -55,10 +55,18 @@ INSTALL()
{ {
make install make install
# remove libtool file
rm $libDir/libdvdcss.la
# prepare develop/lib # prepare develop/lib
prepareInstalledDevelLibs libdvdcss prepareInstalledDevelLib libdvdcss
fixPkgconfig fixPkgconfig
packageEntries devel \ packageEntries devel \
$developDir $developDir
} }
TEST()
{
make check
}

View File

@@ -4,11 +4,11 @@ block device without having to bother about the decryption."
HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html" HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
COPYRIGHT="1998-2015 VideoLAN" COPYRIGHT="1998-2015 VideoLAN"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="1" REVISION="2"
SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2" SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2"
CHECKSUM_SHA256="2089375984800df29a4817b37f3123c1706723342d6dab4d0a8b75c25c2c845a" CHECKSUM_SHA256="2089375984800df29a4817b37f3123c1706723342d6dab4d0a8b75c25c2c845a"
SOURCE_DIR="libdvdcss-${portVersion}" SOURCE_DIR="libdvdcss-$portVersion"
PATCHES="libdvdcss-${portVersion}.patchset" PATCHES="libdvdcss-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc" ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
SECONDARY_ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -36,7 +36,7 @@ BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix cmd:ld$secondaryArchSuffix
cmd:make cmd:make
cmd:libtoolize cmd:libtoolize$secondaryArchSuffix
cmd:aclocal cmd:aclocal
cmd:autoconf cmd:autoconf
" "
@@ -46,7 +46,7 @@ BUILD()
libtoolize --force --copy --install libtoolize --force --copy --install
aclocal aclocal
autoconf autoconf
automake automake --add-missing
runConfigure ./configure runConfigure ./configure
make make
} }
@@ -55,10 +55,18 @@ INSTALL()
{ {
make install make install
# remove libtool file
rm $libDir/libdvdcss.la
# prepare develop/lib # prepare develop/lib
prepareInstalledDevelLibs libdvdcss prepareInstalledDevelLib libdvdcss
fixPkgconfig fixPkgconfig
packageEntries devel \ packageEntries devel \
$developDir $developDir
} }
TEST()
{
make check
}