Date: Thu, 12 Dec 2024 13:00:46 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4000ea4dcd79 - main - multimedia/pwcbsd: only provide the kernel module Message-ID: <202412121300.4BCD0kTK008300@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4000ea4dcd79c3b6068228102bd2dc4047b5fdfc commit 4000ea4dcd79c3b6068228102bd2dc4047b5fdfc Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2024-12-12 12:55:35 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2024-12-12 13:00:40 +0000 multimedia/pwcbsd: only provide the kernel module pwcview(1) is provided by another port: multimedia/pwcview (same version provided). reduce this port to only provide the kernel modules. While working on provide a repos per releases for kernel modules, having ports that only provide the kernel modules simplifies the work, it also make this port cross buildable which is how the kernel module repositories are provided. --- multimedia/pwcbsd/Makefile | 51 ++++----------------------------- multimedia/pwcbsd/files/patch-pwcview.c | 11 ------- multimedia/pwcbsd/pkg-plist | 4 --- 3 files changed, 6 insertions(+), 60 deletions(-) diff --git a/multimedia/pwcbsd/Makefile b/multimedia/pwcbsd/Makefile index f1b2b735b70a..eacf7aaba713 100644 --- a/multimedia/pwcbsd/Makefile +++ b/multimedia/pwcbsd/Makefile @@ -1,6 +1,6 @@ PORTNAME= pwcbsd PORTVERSION= 1.4.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= multimedia sysutils MASTER_SITES= http://raaf.atspace.org/ \ http://www.bsd-geek.de/FreeBSD/distfiles/ \ @@ -12,54 +12,15 @@ WWW= http://raaf.atspace.org/ LICENSE= GPLv2 -CONFLICTS= pwcview - -SSP_UNSAFE= kernel module does not support ssp - -USES= kmod +USES= kmod uidfix WRKSRC= ${WRKDIR}/${PORTNAME} -OPTIONS_DEFINE= PROGRAMS MMAP -OPTIONS_DEFAULT= PROGRAMS -PROGRAMS_DESC= Build the programs -MMAP_DESC= Enable mmap support (MAY CRASH YOUR SYSTEM) - -CFLAGS+= -Wno-error - -.include <bsd.port.options.mk> - -.if !exists(${SRC_BASE}/sys/Makefile) -IGNORE= requires kernel source files -.endif - -.if ${PORT_OPTIONS:MMMAP} -ALL_TARGET= mmap -.else -ALL_TARGET= all -.endif -.if ${PORT_OPTIONS:MPROGRAMS} -ALL_TARGET+= pwcview -PROGRAMS= pwcview -USES+= jpeg sdl -USE_SDL= sdl -PLIST_SUB+= PROGRAMS="" -.else -PLIST_SUB+= PROGRAMS="@comment " -.endif - -post-patch: -.if ${PORT_OPTIONS:MPROGRAMS} - @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile -.endif +MAKEFILE= Makefile.kld -do-install: - ${MKDIR} ${STAGEDIR}${KMODDIR} - ${INSTALL_KLD} ${WRKSRC}/pwc.ko ${STAGEDIR}${KMODDIR} +PLIST_FILES= ${KMODDIR}/pwc.ko \ + share/man/man4/pwc.4.gz +post-install: ${INSTALL_MAN} ${WRKSRC}/pwc.4 ${STAGEDIR}${PREFIX}/share/man/man4 -.if ${PORT_OPTIONS:MPROGRAMS} - ${INSTALL_PROGRAM} ${PROGRAMS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${PROGRAMS:S|^|${WRKSRC}/|}.1 ${STAGEDIR}${PREFIX}/share/man/man1 -.endif .include <bsd.port.mk> diff --git a/multimedia/pwcbsd/files/patch-pwcview.c b/multimedia/pwcbsd/files/patch-pwcview.c deleted file mode 100644 index ed407a6ba22a..000000000000 --- a/multimedia/pwcbsd/files/patch-pwcview.c +++ /dev/null @@ -1,11 +0,0 @@ ---- pwcview.c.orig 2007-10-09 07:03:10 UTC -+++ pwcview.c -@@ -837,6 +837,8 @@ void jpeg_write(int height, JSAMPIMAGE jimage, struct - jdata[1] = jimage[1]; - jdata[2] = jimage[2]; - -+ cinfo->raw_data_in = TRUE; -+ cinfo->do_fancy_downsampling = FALSE; - jpeg_stdio_dest(cinfo, outfile); - jpeg_start_compress(cinfo, TRUE); - diff --git a/multimedia/pwcbsd/pkg-plist b/multimedia/pwcbsd/pkg-plist deleted file mode 100644 index 8a31e80c4b52..000000000000 --- a/multimedia/pwcbsd/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -%%PROGRAMS%%bin/pwcview -%%PROGRAMS%%share/man/man1/pwcview.1.gz -share/man/man4/pwc.4.gz -/%%KMODDIR%%/pwc.ko
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412121300.4BCD0kTK008300>