Date: Wed, 7 Jun 2006 17:23:10 +0200 From: "Danny Pansters" <danny@ricin.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: danny@ricin.com Subject: ports/98631: [maintainer] multimedia/kbtv: update to 1.1 Message-ID: <20060607152320.6801643D46@mx1.FreeBSD.org> Resent-Message-ID: <200606071750.k57HoIho050705@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98631 >Category: ports >Synopsis: [maintainer] multimedia/kbtv: update to 1.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jun 07 17:50:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Danny Pansters >Release: FreeBSD 6.1-RC i386 >Organization: >Environment: System: FreeBSD desktop.homenet 6.1-RC FreeBSD 6.1-RC #0: Fri Apr 14 22:14:32 CEST 2006 danny@desktop.homenet:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update to version 1.1. Changes since 1.0-RC2 include: - Redesign and rewrite of the "bt" modules, GUI improvements (1.0-R3) - Add btsetup utility (1.0-R3) - Add support for SAA based cards (1.0) - Add support for PWC based cameras (1.0.1, was never released) - Remove dependency of 3rd party players, instead have own SDL viewers (1.1) >How-To-Repeat: >Fix: --- multimedia::kbtv.diff begins here --- diff -ruN multimedia/kbtv.old/Makefile multimedia/kbtv/Makefile --- multimedia/kbtv.old/Makefile Tue Jun 6 22:23:02 2006 +++ multimedia/kbtv/Makefile Wed Jun 7 02:43:14 2006 @@ -6,75 +6,109 @@ # PORTNAME= kbtv -DISTVERSION= 1.0-rc2 +DISTVERSION= 1.1 CATEGORIES= multimedia python kde MASTER_SITES= http://freebsd.ricin.com/ports/distfiles/ EXTRACT_SUFX= .tbz MAINTAINER= danny@ricin.com -COMMENT= Simple KDE TV viewer for BSD +COMMENT= KDE TV viewer for FreeBSD -BUILD_DEPENDS= pyuic:${PORTSDIR}/x11-toolkits/py-qt \ - kdepyuic:${PORTSDIR}/x11-toolkits/py-kde \ - mplayer:${PORTSDIR}/multimedia/mplayer -RUN_DEPENDS= ${BUILD_DEPENDS} +RUN_DEPENDS= kdepyuic:${PORTSDIR}/x11-toolkits/py-kde +BUILD_DEPENDS= ${RUN_DEPENDS} swig:${PORTSDIR}/devel/swig13 USE_BZIP2= YES USE_KDELIBS_VER=3 USE_PYTHON= yes +USE_SDL= sdl -OPTIONS= DOCS "Install (KDE) documentation" on \ - MANPAGES "Install btcontrol manpage" on \ - MAN_COMPRESS "Compress manpage" on \ - UIFILES "Install Designer (ui) files" on +OPTIONS= PWC "Philips & compatible cameras (pwc)" off \ + SAA "Philips SAA713x based TV cards (saa)" off \ + SAA_TUNER_PHILIPS "Philips tuner API" on \ + SAA_TUNER_PHILIPS_MK3 "Philips MK3 tuner API" off \ + SAA_TUNER_ALPS "Alps tuner API" off \ + SAA_TUNER_LG "LG tuner API" off \ + SAA_TUNER_TEMIC "Temic tuner API" off \ + SAA_TUNER_NTSC "NTSC tuner standard (default PAL)" off \ + SAA_TUNER_0xC2 "IIC read address 0xc2 (default 0xc0)" off .include <bsd.port.pre.mk> -.if defined(NOPORTDOCS) || defined(WITHOUT_DOCS) -PLIST_SUB+= DOCS="@comment " +.if defined(WITH_PWC) +.if !exists(/usr/src/sys/Makefile) +IGNORE= kernel sources required for pwc +.endif +PLIST_SUB+= PWC="" +BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \ + /boot/modules/pwc.ko:${PORTSDIR}/multimedia/pwcbsd .else -PLIST_SUB+= DOCS="" +PLIST_SUB+= PWC="@comment " .endif -.if defined(NO_INSTALL_MANPAGES) || defined(WITHOUT_MANPAGES) -PLIST_SUB+= MAN="@comment " -.else -PLIST_SUB+= MAN="" +.if defined(WITH_SAA) +.if !exists(/usr/src/sys/Makefile) +IGNORE= kernel sources required for saa .endif - -.if defined(NOMANCOMPRESS) || defined(WITHOUT_MAN_COMPRESS) -PLIST_SUB+= CMAN="man1/btcontrol.1" +PLIST_SUB+= SAA="" .else -PLIST_SUB+= CMAN="man1/btcontrol.1.gz" +PLIST_SUB+= SAA="@comment " .endif -.if defined(WITHOUT_UIFILES) -PLIST_SUB+= UI="@comment " -.else -PLIST_SUB+= UI="" +.if defined(WITH_PWC) || defined(WITH_SAA) +NO_PACKAGE= port requires building against local kernel sources .endif post-patch: - @${REINPLACE_CMD} -e 's|PREFIX = /usr/local|PREFIX = ${PREFIX}|' \ - ${WRKSRC}/install.cfg -.if defined(NOPORTDOCS) || defined(WITHOUT_DOCS) - @${REINPLACE_CMD} -e 's|INSTALL_DOCS = yes|INSTALL_DOCS = |' \ - ${WRKSRC}/install.cfg -.endif -.if defined(NOMANCOMPRESS) || defined(WITHOUT_MAN_COMPRESS) - @${REINPLACE_CMD} -e 's|MANPAGES_COMPRESS = yes|MANPAGES_COMPRESS = |' \ - ${WRKSRC}/install.cfg -.endif -.if defined(NO_INSTALL_MANPAGES) || defined(WITHOUT_MANPAGES) - @${REINPLACE_CMD} -e 's|INSTALL_MANPAGES = yes|INSTALL_MANPAGES = |' \ - ${WRKSRC}/install.cfg -.endif -.if defined(WITHOUT_UIFILES) - @${REINPLACE_CMD} -e 's|INSTALL_UIFILES = yes|INSTALL_UIFILES = |' \ - ${WRKSRC}/install.cfg + @${REINPLACE_CMD} -e 's|FROMPORT = False|FROMPORT = True|' \ + ${WRKSRC}/installprefs.py + @${REINPLACE_CMD} -e 's|sdl11-config|${SDL_CONFIG}|g' \ + ${WRKSRC}/do_build.py +.if defined(WITH_PWC) + @${REINPLACE_CMD} -e 's|WITH_PWC = False|WITH_PWC = True|' \ + ${WRKSRC}/buildprefs.py +.endif +.if defined(WITH_SAA) + @${REINPLACE_CMD} -e 's|WITH_SAA = False|WITH_SAA = True|' \ + ${WRKSRC}/buildprefs.py +.if defined(WITHOUT_SAA_TUNER_PHILIPS) +.if defined(WITH_SAA_TUNER_PHILIPS_MK3) + @${REINPLACE_CMD} -e \ + 's|SAA_TUNER = SAA_TUNER_PHILIPS|SAA_TUNER = SAA_TUNER_PHILIPS_MK3|' \ + ${WRKSRC}/buildprefs.py +.elif defined(WITH_SAA_TUNER_ALPS) + @${REINPLACE_CMD} -e \ + 's|SAA_TUNER = SAA_TUNER_PHILIPS|SAA_TUNER = SAA_TUNER_ALPS|' \ + ${WRKSRC}/buildprefs.py +.elif defined(WITH_SAA_TUNER_LG) + @${REINPLACE_CMD} -e \ + 's|SAA_TUNER = SAA_TUNER_PHILIPS|SAA_TUNER = SAA_TUNER_LG|' \ + ${WRKSRC}/buildprefs.py +.elif defined(WITH_SAA_TUNER_TEMIC) + @${REINPLACE_CMD} -e \ + 's|SAA_TUNER = SAA_TUNER_PHILIPS|SAA_TUNER = SAA_TUNER_TEMIC|' \ + ${WRKSRC}/buildprefs.py +.endif +.if defined(WITH_SAA_TUNER_NTSC) + @${REINPLACE_CMD} -e \ + 's|SAA_TUNER_STD = SAA_TUNER_STD_PAL|SAA_TUNER_STD = SAA_TUNER_STD_NTSC|' \ + ${WRKSRC}/buildprefs.py +.endif +.if defined(WITH_SAA_TUNER_0xC2) + @${REINPLACE_CMD} -e \ + 's|SAA_TUNER_IIC = SAA_IIC_0xC0|SAA_TUNER_IIC = SAA_IIC_0xC2|' \ + ${WRKSRC}/buildprefs.py +.endif +.endif .endif do-configure: - @(cd ${WRKSRC} && ${MAKE} configure) + @cd ${WRKSRC} && ${MAKE} configure + +post-install: +.if !defined(NOPORTDOCS) + @cd ${WRKSRC} && ${MKDIR} ${DOCSDIR} && \ + ${INSTALL_DATA} README NEWS ${DOCSDIR} +.endif .include <bsd.port.post.mk> diff -ruN multimedia/kbtv.old/distinfo multimedia/kbtv/distinfo --- multimedia/kbtv.old/distinfo Sat Dec 17 02:31:40 2005 +++ multimedia/kbtv/distinfo Wed Jun 7 01:59:22 2006 @@ -1,3 +1,3 @@ -MD5 (kbtv-1.0-rc2.tbz) = 2ad0d5f60d6b30d874189037e25983ec -SHA256 (kbtv-1.0-rc2.tbz) = 0f8d4b96fb6b254d78d947cf507a0e0ce039ce5a4b64d12d702730b61514f4ba -SIZE (kbtv-1.0-rc2.tbz) = 459668 +MD5 (kbtv-1.1.tbz) = 3486bcadd61f9708a4f317e56dfb8993 +SHA256 (kbtv-1.1.tbz) = e09384039ca4068aec1efbb5fb8dcaec86d5126d93de1956097af76123c58dcd +SIZE (kbtv-1.1.tbz) = 760711 diff -ruN multimedia/kbtv.old/pkg-descr multimedia/kbtv/pkg-descr --- multimedia/kbtv.old/pkg-descr Wed Dec 7 12:51:27 2005 +++ multimedia/kbtv/pkg-descr Tue Jun 6 22:06:11 2006 @@ -1,3 +1,6 @@ -A simple KDE TV viewer for BSD +KDE TV viewer for FreeBSD + +Supports BrookTree/Conexant BT8x8 (bktr) and Philips SAA713x (saa) based +TV cards, and Philips/compatible (pwc) based USB cameras. WWW: http://freebsd.ricin.com/kbtv diff -ruN multimedia/kbtv.old/pkg-message multimedia/kbtv/pkg-message --- multimedia/kbtv.old/pkg-message Thu Jan 1 01:00:00 1970 +++ multimedia/kbtv/pkg-message Tue Jun 6 22:06:45 2006 @@ -0,0 +1,20 @@ + + N O T E +==================================================================== +Before you can sucessfully run kbtv, you must run btsetup as root or +manually set up correct module loading, device permissions (use the +operator group, not wheel), group membership, and if needed sysctls. + +Consult the README on how to use btsetup. For the impatient: on the +btsetup prompt you first issue kldload commands if needed, then +sysctl commands if needed, then the commit command, and finally the +adduser command. Use show to see current status, help when lost. + +For BrookTree/Conexant BT8x8 you need to load the bktr module, for +Philips SAA713x you need to load the saa module, for Philips and +compatible USB cameras you need to load the pwc module. + +If you're having trouble, please look at the (KDE) documentation and +the README first, before asking me. Thanks. +==================================================================== + diff -ruN multimedia/kbtv.old/pkg-plist multimedia/kbtv/pkg-plist --- multimedia/kbtv.old/pkg-plist Sat Dec 17 02:31:40 2005 +++ multimedia/kbtv/pkg-plist Wed Jun 7 16:55:34 2006 @@ -1,64 +1,96 @@ -bin/btcontrol +bin/btviewer bin/kbtv -share/apps/kbtv/btaudio.py -share/apps/kbtv/btaudio.pyc +%%SAA%%bin/saaviewer +sbin/btsetup +share/applications/kde/kbtv.desktop +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +share/apps/kbtv/_bt848.so +%%PWC%%share/apps/kbtv/_pwc.so +%%SAA%%share/apps/kbtv/_saa.so +share/apps/kbtv/bt848.py +share/apps/kbtv/bt848.pyc share/apps/kbtv/btbackend.py share/apps/kbtv/btbackend.pyc -share/apps/kbtv/btcontrol.py -share/apps/kbtv/btcontrol.pyc -share/apps/kbtv/dialog_add_channels.py -share/apps/kbtv/dialog_add_channels.pyc -share/apps/kbtv/dialog_channel_editor.py -share/apps/kbtv/dialog_channel_editor.pyc -share/apps/kbtv/dialog_hardware_info.py -share/apps/kbtv/dialog_hardware_info.pyc -share/apps/kbtv/dialog_picture_settings.py -share/apps/kbtv/dialog_picture_settings.pyc -share/apps/kbtv/input.kbtv -share/apps/kbtv/kbtv.py -share/apps/kbtv/kbtv.pyc +share/apps/kbtv/btchannels.py +share/apps/kbtv/btchannels.pyc +share/apps/kbtv/btcopyright.py +share/apps/kbtv/btcopyright.pyc +share/apps/kbtv/btdriver.py +share/apps/kbtv/btdriver.pyc +share/apps/kbtv/bthardware.py +share/apps/kbtv/bthardware.pyc +share/apps/kbtv/btsetup.py +share/apps/kbtv/btsetup.pyc +share/apps/kbtv/buildprefs.py +share/apps/kbtv/buildprefs.pyc +share/apps/kbtv/channel_add.py +share/apps/kbtv/channel_add.pyc +share/apps/kbtv/channel_editor.py +share/apps/kbtv/channel_editor.pyc +share/apps/kbtv/channel_process.py +share/apps/kbtv/channel_process.pyc +share/apps/kbtv/hardware_info.py +share/apps/kbtv/hardware_info.pyc +share/apps/kbtv/installprefs.py +share/apps/kbtv/installprefs.pyc +share/apps/kbtv/kbtv_application.py +share/apps/kbtv/kbtv_application.pyc share/apps/kbtv/kbtv_channels.py share/apps/kbtv/kbtv_channels.pyc -share/apps/kbtv/kbtv_frequencies.py -share/apps/kbtv/kbtv_frequencies.pyc +share/apps/kbtv/kbtv_dcop.py +share/apps/kbtv/kbtv_dcop.pyc share/apps/kbtv/kbtv_hardware.py share/apps/kbtv/kbtv_hardware.pyc +share/apps/kbtv/kbtv_part.py +share/apps/kbtv/kbtv_part.pyc share/apps/kbtv/kbtv_picture.py share/apps/kbtv/kbtv_picture.pyc share/apps/kbtv/kbtv_splash.png share/apps/kbtv/kbtv_toolbar.py share/apps/kbtv/kbtv_toolbar.pyc +share/apps/kbtv/kbtv_version.py +share/apps/kbtv/kbtv_version.pyc share/apps/kbtv/kbtvui.rc share/apps/kbtv/pics/kbtv.png -share/apps/kbtv/pics/kbtv_splash.png share/apps/kbtv/pics/volume_down.png share/apps/kbtv/pics/volume_up.png -share/apps/kbtv/widget_toolbar.py -share/apps/kbtv/widget_toolbar.pyc -share/applications/kde/kbtv.desktop +share/apps/kbtv/picture_settings.py +share/apps/kbtv/picture_settings.pyc +%%PWC%%share/apps/kbtv/pwc.py +%%PWC%%share/apps/kbtv/pwc.pyc +%%SAA%%share/apps/kbtv/saa.py +%%SAA%%share/apps/kbtv/saa.pyc +share/apps/kbtv/toolbar_widget.py +share/apps/kbtv/toolbar_widget.pyc +share/doc/HTML/en/kbtv/btsetup.html +share/doc/HTML/en/kbtv/commands.html +share/doc/HTML/en/kbtv/credits.html +share/doc/HTML/en/kbtv/index.cache.bz2 +share/doc/HTML/en/kbtv/index.docbook +share/doc/HTML/en/kbtv/index.html +share/doc/HTML/en/kbtv/install.html +share/doc/HTML/en/kbtv/introduction.html +share/doc/HTML/en/kbtv/kbtv-channel-dialogs.html +share/doc/HTML/en/kbtv/kbtv-commands-hacking.html +share/doc/HTML/en/kbtv/kbtv-menus.html +share/doc/HTML/en/kbtv/kbtv-other-dialogs.html +share/doc/HTML/en/kbtv/kbtv_screenshot_dialog_add_channels.png +share/doc/HTML/en/kbtv/kbtv_screenshot_dialog_channel_editor.png +share/doc/HTML/en/kbtv/kbtv_screenshot_dialog_hardware.png +share/doc/HTML/en/kbtv/kbtv_screenshot_dialog_picture.png +share/doc/HTML/en/kbtv/kbtv_screenshot_dialog_processing.png +share/doc/HTML/en/kbtv/kbtv_screenshot_kdcop.png +share/doc/HTML/en/kbtv/kbtv_screenshot_main_window.png +share/doc/HTML/en/kbtv/kbtv_screenshot_main_window_webcam.png +share/doc/HTML/en/kbtv/kbtv_screenshot_menus.png +share/doc/HTML/en/kbtv/using-kbtv.html share/icons/crystalsvg/64x64/apps/kbtv.png -%%UI%%share/apps/kbtv/ui/dialog_add_channels.ui -%%UI%%share/apps/kbtv/ui/dialog_channel_editor.ui -%%UI%%share/apps/kbtv/ui/dialog_hardware_info.ui -%%UI%%share/apps/kbtv/ui/dialog_picture_settings.ui -%%UI%%share/apps/kbtv/ui/widget_toolbar.ui -%%DOCS%%share/doc/HTML/en/kbtv/commands.html -%%DOCS%%share/doc/HTML/en/kbtv/common -%%DOCS%%share/doc/HTML/en/kbtv/credits.html -%%DOCS%%share/doc/HTML/en/kbtv/index.cache.bz2 -%%DOCS%%share/doc/HTML/en/kbtv/index.docbook -%%DOCS%%share/doc/HTML/en/kbtv/index.html -%%DOCS%%share/doc/HTML/en/kbtv/introduction.html -%%DOCS%%share/doc/HTML/en/kbtv/kbtv-addchannels.png -%%DOCS%%share/doc/HTML/en/kbtv/kbtv-channeleditor.png -%%DOCS%%share/doc/HTML/en/kbtv/kbtv-dcop.html -%%DOCS%%share/doc/HTML/en/kbtv/kbtv-hardwareinfo.png -%%DOCS%%share/doc/HTML/en/kbtv/kbtv-main.png -%%DOCS%%share/doc/HTML/en/kbtv/kbtv-picturesettings.png -%%DOCS%%share/doc/HTML/en/kbtv/kbtv-ui.png -%%DOCS%%share/doc/HTML/en/kbtv/using-kbtv.html -%%MAN%%man/%%CMAN%% -@dirrm %%DOCS%%share/doc/HTML/en/kbtv -@dirrm %%UI%%share/apps/kbtv/ui +@dirrm share/doc/HTML/en/kbtv @dirrm share/apps/kbtv/pics @dirrm share/apps/kbtv +%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%SAA%%@cwd /boot/modules +%%SAA%%saa.ko +%%SAA%%@exec kldxref %D +%%SAA%%@unexec kldxref %D --- multimedia::kbtv.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060607152320.6801643D46>