public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/lxdvdrip/, media-video/lxdvdrip/files/
@ 2022-01-12 21:31 Jakov Smolić
  0 siblings, 0 replies; 2+ messages in thread
From: Jakov Smolić @ 2022-01-12 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c0cd44d8b8b65fa02faf42b5965500fdf39ba231
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 21:19:27 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 21:31:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0cd44d8

media-video/lxdvdrip: Port to EAPI 8

Closes: https://bugs.gentoo.org/819435
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 .../lxdvdrip/files/lxdvdrip-1.77-makefile.patch    |  4 +--
 .../files/lxdvdrip-1.77-vamps-makefile.patch       |  4 +--
 ...xdvdrip-1.77.ebuild => lxdvdrip-1.77-r1.ebuild} | 32 +++++++++++-----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
index 35df8fb65400..5d2684c07c88 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2014-03-17 15:40:30.886570544 -0600
-+++ Makefile	2014-03-17 15:41:22.729159468 -0600
+--- a/Makefile
++++ b/Makefile
 @@ -3,31 +3,15 @@
  HINWEIS1 = 'Check the configuration file in /etc with the Changelog'
  HINWEIS2 = 'Comparez le fichier de config. en /etc avec le Changelog'

diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
index 7c32d44ef371..d497773aae1b 100644
--- a/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-vamps-makefile.patch
@@ -1,5 +1,5 @@
---- vamps/Makefile.orig	2014-03-17 15:44:50.086513525 -0600
-+++ vamps/Makefile	2014-03-17 15:44:56.443321441 -0600
+--- a/vamps/Makefile
++++ b/vamps/Makefile
 @@ -21,7 +21,7 @@
  CFLAGS    ?= -O2  -g -D_LARGEFILE_SOURCE -DLARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
  	       -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT

diff --git a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
similarity index 72%
rename from media-video/lxdvdrip/lxdvdrip-1.77.ebuild
rename to media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
index f925ac98c665..367fd0494709 100644
--- a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild
+++ b/media-video/lxdvdrip/lxdvdrip-1.77-r1.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Command line tool to automate the process of ripping and burning DVDs"
-SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
 HOMEPAGE="https://sourceforge.net/projects/lxdvdrip/"
+SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="media-libs/libdvdread"
 RDEPEND="${DEPEND}
 	>=media-video/dvdauthor-0.6.9
 	media-video/streamdvd
-	media-video/mpgtx"
+	media-video/mpgtx
+"
 
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-vamps-makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-vamps-makefile.patch
+)
 
 src_compile() {
-	CC="$(tc-getCC)" emake
-	cd "${S}/vamps"
-	emake CC="$(tc-getCC)"
+	tc-export CC
+	emake
+	emake -C vamps
 }
 
 src_install() {
@@ -45,6 +45,6 @@ src_install() {
 	insinto /etc
 	newins doc-pak/lxdvdrip.conf.EN lxdvdrip.conf
 
-	cd "${S}/vamps"
+	cd vamps || die
 	emake PREFIX="${D}/usr" install
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/lxdvdrip/, media-video/lxdvdrip/files/
@ 2023-08-22  7:45 Joonas Niilola
  0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2023-08-22  7:45 UTC (permalink / raw
  To: gentoo-commits

commit:     89b422287c081ac7b05c896db479dcee11e59abe
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sun Jul 16 18:32:33 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 07:35:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b42228

media-video/lxdvdrip: Fix call to undeclared function ioctl

Closes: https://bugs.gentoo.org/885573
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31916
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/lxdvdrip-1.77-clang-16-build.patch       | 38 ++++++++++++++++
 media-video/lxdvdrip/lxdvdrip-1.77-r2.ebuild       | 51 ++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/media-video/lxdvdrip/files/lxdvdrip-1.77-clang-16-build.patch b/media-video/lxdvdrip/files/lxdvdrip-1.77-clang-16-build.patch
new file mode 100644
index 000000000000..98f1ae30220d
--- /dev/null
+++ b/media-video/lxdvdrip/files/lxdvdrip-1.77-clang-16-build.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/885573
+--- a/dvdbackup.c
++++ b/dvdbackup.c
+@@ -30,6 +30,7 @@ COMMENTAIRE :
+ 
+ #include "const.h"
+ #include "dvdformat.h"
++#include "dvdcopy.h"
+ #include "dvdinfo.h"
+ #include "globals.h"
+ #include "systools.h"
+--- a/dvdcopy.h
++++ b/dvdcopy.h
+@@ -14,6 +14,7 @@ COMMENTAIRE :
+ 
+ #ifndef __DVDCOPY_H__
+ #define __DVDCOPY_H__
++#include <dvdread/ifo_read.h>
+ /*@$#[dvdcopy.c] global proto. AutoProtoSigV1.1. date: 106/01/05 21:32:04 */
+ #include "proto.h"
+ #ifdef __cplusplus
+--- a/systools.c
++++ b/systools.c
+@@ -20,12 +20,8 @@ COMMENTAIRE :
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#if defined(__sun)
+-#	include <sys/statvfs.h>
+-#	include <sys/ioctl.h>
+-#else
+-#	include <sys/statfs.h>
+-#endif
++#include <sys/statfs.h>
++#include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #if defined(__sun)

diff --git a/media-video/lxdvdrip/lxdvdrip-1.77-r2.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77-r2.ebuild
new file mode 100644
index 000000000000..e1f495467a8e
--- /dev/null
+++ b/media-video/lxdvdrip/lxdvdrip-1.77-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command line tool to automate the process of ripping and burning DVDs"
+HOMEPAGE="https://sourceforge.net/projects/lxdvdrip/"
+SRC_URI="mirror://sourceforge/lxdvdrip/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="media-libs/libdvdread"
+RDEPEND="${DEPEND}
+	>=media-video/dvdauthor-0.6.9
+	media-video/streamdvd
+	media-video/mpgtx
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-vamps-makefile.patch
+	"${FILESDIR}"/${P}-clang-16-build.patch
+)
+
+src_compile() {
+	tc-export CC
+	emake
+	emake -C vamps
+}
+
+src_install() {
+	dobin lxdvdrip
+	dobin lxac3scan
+	dodoc doc-pak/Changelog* doc-pak/Credits doc-pak/Debugging.*
+	dodoc doc-pak/lxdvdrip.conf* doc-pak/README*
+	doman lxdvdrip.1
+
+	insinto /usr/share
+	doins lxdvdrip.wav
+
+	insinto /etc
+	newins doc-pak/lxdvdrip.conf.EN lxdvdrip.conf
+
+	cd vamps || die
+	emake PREFIX="${D}/usr" install
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-08-22  7:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-22  7:45 [gentoo-commits] repo/gentoo:master commit in: media-video/lxdvdrip/, media-video/lxdvdrip/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2022-01-12 21:31 Jakov Smolić

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox