diff --git a/media-libs/libdvdcss/libdvdcss-1.4.0.recipe b/media-libs/libdvdcss/libdvdcss-1.4.2.recipe similarity index 79% rename from media-libs/libdvdcss/libdvdcss-1.4.0.recipe rename to media-libs/libdvdcss/libdvdcss-1.4.2.recipe index 98397b9cc..970b262e0 100644 --- a/media-libs/libdvdcss/libdvdcss-1.4.0.recipe +++ b/media-libs/libdvdcss/libdvdcss-1.4.2.recipe @@ -2,20 +2,23 @@ SUMMARY="A library to access DVDs" DESCRIPTION="libdvdcss is a simple library designed for accessing DVDs like a \ block device without having to bother about the decryption." HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html" -COPYRIGHT="1998-2015 VideoLAN" +COPYRIGHT="1998-2018 VideoLAN" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://download.videolan.org/pub/libdvdcss/$portVersion/libdvdcss-$portVersion.tar.bz2" -CHECKSUM_SHA256="2089375984800df29a4817b37f3123c1706723342d6dab4d0a8b75c25c2c845a" +CHECKSUM_SHA256="78c2ed77ec9c0d8fbed7bf7d3abc82068b8864be494cfad165821377ff3f2575" SOURCE_DIR="libdvdcss-$portVersion" PATCHES="libdvdcss-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +libVersion="2.2.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" libdvdcss$secondaryArchSuffix = $portVersion - lib:libdvdcss$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libdvdcss$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -23,7 +26,7 @@ REQUIRES=" PROVIDES_devel=" libdvdcss${secondaryArchSuffix}_devel = $portVersion - devel:libdvdcss$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libdvdcss$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" libdvdcss$secondaryArchSuffix == $portVersion base @@ -33,12 +36,13 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:libtoolize$secondaryArchSuffix cmd:aclocal cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make " BUILD() diff --git a/media-libs/libdvdcss/patches/libdvdcss-1.4.0.patchset b/media-libs/libdvdcss/patches/libdvdcss-1.4.2.patchset similarity index 93% rename from media-libs/libdvdcss/patches/libdvdcss-1.4.0.patchset rename to media-libs/libdvdcss/patches/libdvdcss-1.4.2.patchset index feba19b50..df09968d7 100644 --- a/media-libs/libdvdcss/patches/libdvdcss-1.4.0.patchset +++ b/media-libs/libdvdcss/patches/libdvdcss-1.4.2.patchset @@ -5,7 +5,7 @@ Subject: gcc2 patch diff --git a/src/device.c b/src/device.c -index af735e0..1524bc7 100644 +index baa4bc5..41ce107 100644 --- a/src/device.c +++ b/src/device.c @@ -117,6 +117,7 @@ int dvdcss_use_ioctls( dvdcss_t dvdcss ) @@ -25,5 +25,5 @@ index af735e0..1524bc7 100644 } -- -2.2.2 +2.17.0