From nobody Thu Dec 12 13:00:46 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8CJH0VJVz5gFcl; Thu, 12 Dec 2024 13:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8CJG6f3lz4QDR; Thu, 12 Dec 2024 13:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734008446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+wG/+Bet2obOdjrG7PDAHLaqu5ucWmZzl+ewDXyOro=; b=G4Hudm8dSC+yVT7iazCtv/r1N8ysXB2iSXd9CwpeMXytcnT2hqKtx11erE8Ad3cWDhN3V8 Eoh1I/w4xbEbtNCbJDvsBcNngT67BvHQk7TtNEVcy3nbdb2yNNdaksp79Z9SQbTo54Ls+0 DyeIjpF/6cKW5UAih4HjxD8vjSBx4HeB8JIxHJkxBR4QBZWElmlRrhJIwt1XO+qjMijW84 j6HVn8vQGM6hP/gQVKAAz1Cd3ZIWeKXsL0O/9J/w7yed841BOLQAJHArRqFzaQwsd3DgGp GZ3KokmqYgjDslKug5SUmtDsVXX86/zNX7IOoazSVbnK3KH1Ev+xiEdVVzMn/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734008446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+wG/+Bet2obOdjrG7PDAHLaqu5ucWmZzl+ewDXyOro=; b=sCiuRmxpnPZowbYhIfaMQiezhK8JI92zI8A3OWlTKlOOSuAYa6mnkifolFhsssBNjxK1xg vXcNxusridNeepteygBwTcfGr8vtQLX34ePFtiOPLqRZOZqk5xcYJjCEbqCvrE+7GjPPkm o615+gIv431lgQ+5p93749hVdPXBtJ+e7hx70Sx1JClTE6XQS5ueXNc/S7f7vmX3r2XRon V+i6DuQOxk306pOpVismlbwjfK/zqR/yCCK9xKn5sE9AapSrjwqKV6QrtC5RJ3x59kXQiQ N9Y6RMydWu5ALQiVe7xI9sEpkfoNY3JqtwfsJoepq937OAu1Yn4qX+pePHEiVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734008446; a=rsa-sha256; cv=none; b=bd8eVCWOMwjXNMaMDshYfGOvTHzBJVwx4bYW8TgMoR2vm0/cySBR0LSKfOiWgb9C1A44wl trSLiDPudSc729UEKVwmY5Mc3bOBA3vVNAPn1lhNYXvb+ogpadRGm79BnJJ8NZeBQIjnog ptZf8dxhKuSxvJAngj/bo/z7BS5gljKR1Jwjvq+le9to//KDlzrZNqHpJYHj+bKgY5J7Dw IrXsO2qCAY9TY0eYHuLiaIo6wEvZYKXoP/dzBLD0gMJHXdCPV/fs0hSf9qqK0zRFb5Vh5/ IUMpPleEWnLQ4SvLLXFZ83+S8PmuB2c5he9MRISwy7sJ9VNNDk8fpd4mdek21Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8CJG6FNgztb7; Thu, 12 Dec 2024 13:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BCD0k7o008303; Thu, 12 Dec 2024 13:00:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCD0kTK008300; Thu, 12 Dec 2024 13:00:46 GMT (envelope-from git) Date: Thu, 12 Dec 2024 13:00:46 GMT Message-Id: <202412121300.4BCD0kTK008300@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4000ea4dcd79 - main - multimedia/pwcbsd: only provide the kernel module List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4000ea4dcd79c3b6068228102bd2dc4047b5fdfc Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4000ea4dcd79c3b6068228102bd2dc4047b5fdfc commit 4000ea4dcd79c3b6068228102bd2dc4047b5fdfc Author: Baptiste Daroussin AuthorDate: 2024-12-12 12:55:35 +0000 Commit: Baptiste Daroussin 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 - -.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 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