Index: head/multimedia/sms1xxx-kmod/Makefile =================================================================== --- head/multimedia/sms1xxx-kmod/Makefile (revision 416935) +++ head/multimedia/sms1xxx-kmod/Makefile (revision 416936) @@ -1,119 +1,109 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= sms1xxx PORTVERSION= 20120113 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://contribs.martymac.org/FreeBSD-siano/ PKGNAMESUFFIX= -kmod DISTNAME= siano-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= martymac@FreeBSD.org COMMENT= Native FreeBSD driver for Siano-based USB DVB devices LICENSE= GPLv2 WRKSRC= ${WRKDIR}/siano-${PORTVERSION} NO_PACKAGE= should be recompiled for a particular FreeBSD kernel NO_OPTIONS_SORT= yes OPTIONS_DEFINE= RC5WATCH DEBUG OPTIONS_MULTI= FIRMWARE OPTIONS_MULTI_FIRMWARE= STELLAR NOVA OPTIONS_DEFAULT= RC5WATCH NOVA OPTIONS_SUB= yes RC5WATCH_DESC= Build rc5watch IR utility DEBUG_ALL_TARGET= debug STELLAR_DESC= Build Terratec Cinergy Piranha FW NOVA_DESC= Build Hauppauge WinTV MiniStick FW ONLY_FOR_ARCHS= i386 amd64 SUB_FILES= pkg-message PORTDOCS= CHANGELOG README COPYING # Supported firmwares / firmwares to build STELLAR_FW= stellar_dvbt NOVA_FW= novab0_dvbbda BUILD_FWS= USES= kmod tar:tgz .include .if ${PORT_OPTIONS:MSTELLAR} BUILD_FWS+= ${STELLAR_FW} .if !exists(${DISTDIR}/${DIST_SUBDIR}/${STELLAR_FW}.fw) .if !defined(DISTFILE_INSTRUCTIONS) DISTFILE_INSTRUCTIONS=\n\ Due to licensing restrictions, firmware files must be fetched manually.\n .endif DISTFILE_INSTRUCTIONS+= \ \n- Please, get the appropriate firmware for your Stellar device\n\ - and copy the file to '${DISTDIR}/${DIST_SUBDIR}/${STELLAR_FW}.fw'\n\ - e.g. :\n\ - wget 'ftp://ftp.terratec.net/Receiver/Cinergy_Piranha/Update/Cinergy_Piranha_Drv_Vista_XP_3.09.02.00.exe'\n\ - unzip -j 'Cinergy_Piranha_Drv_Vista_XP_3.09.02.00.exe' \\\\\n\ - \t'Cinergy Piranha/BDA Driver 3.09.02.00/Windos XP (32Bit)/SMS100x_Dvbt.inp'\n\ - mv 'SMS100x_Dvbt.inp' '${DISTDIR}/${DIST_SUBDIR}/${STELLAR_FW}.fw'\n + and copy the file to '${DISTDIR}/${DIST_SUBDIR}/${STELLAR_FW}.fw'\n .endif .endif .if ${PORT_OPTIONS:MNOVA} BUILD_FWS+= ${NOVA_FW} .if !exists(${DISTDIR}/${DIST_SUBDIR}/${NOVA_FW}.fw) .if !defined(DISTFILE_INSTRUCTIONS) DISTFILE_INSTRUCTIONS=\n\ Due to licensing restrictions, firmware files must be fetched manually.\n .endif DISTFILE_INSTRUCTIONS+= \ \n- Please, get the appropriate firmware for your Nova device\n\ - and copy the file to '${DISTDIR}/${DIST_SUBDIR}/${NOVA_FW}.fw'\n\ - e.g. :\n\ - wget 'http://www.wintvcd.co.uk/drivers/WinTV-MiniStick_4_2_26_28027_WHQL.zip'\n\ - unzip -j 'WinTV-MiniStick_4_2_26_28027_WHQL.zip' \\\\\n\ - \t'driver17/hcw17dvb.1b0'\n\ - mv 'hcw17dvb.1b0' '${DISTDIR}/${DIST_SUBDIR}/${NOVA_FW}.fw'\n + and copy the file to '${DISTDIR}/${DIST_SUBDIR}/${NOVA_FW}.fw'\n .endif .endif .if defined(DISTFILE_INSTRUCTIONS) .if defined(PACKAGE_BUILDING) IGNORE= requires manual fetch .else pre-fetch: @${MKDIR} ${DISTDIR}/${DIST_SUBDIR} @${PRINTF} "${DISTFILE_INSTRUCTIONS}" @exit 1 .endif .endif post-patch: @${REINPLACE_CMD} -e 's|SUBDIR=|SUBDIR= ${BUILD_FWS}|' \ ${WRKSRC}/firmwares/Makefile pre-build: .if ${PORT_OPTIONS:MSTELLAR} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${STELLAR_FW}.fw ${WRKSRC}/firmwares/${STELLAR_FW}/ .endif .if ${PORT_OPTIONS:MNOVA} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${NOVA_FW}.fw ${WRKSRC}/firmwares/${NOVA_FW}/ .endif post-build: .if ${PORT_OPTIONS:MRC5WATCH} @cd ${WRKSRC}/apps/rc5watch/ && ${MAKE} all .endif post-install: .if ${PORT_OPTIONS:MRC5WATCH} ${INSTALL_PROGRAM} ${WRKSRC}/apps/rc5watch/rc5watch ${STAGEDIR}${PREFIX}/bin/rc5watch .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/multimedia/sms1xxx-kmod/files/patch-8cf5b276 =================================================================== --- head/multimedia/sms1xxx-kmod/files/patch-8cf5b276 (nonexistent) +++ head/multimedia/sms1xxx-kmod/files/patch-8cf5b276 (revision 416936) @@ -0,0 +1,31 @@ +commit 8cf5b276a25047ed9cef710f73c59e0f63d7f337 +Author: Ganael Laplanche +Date: Wed Feb 11 09:04:46 2015 +0100 + + Use int instead of u8 for variables handled through SYSCTL_ADD_INT + +--- sms1xxx-gpio.h.orig ++++ sms1xxx-gpio.h +@@ -88,7 +88,7 @@ struct sms1xxx_gpio { + /* Other */ + u32 get_res; /* last GET result */ + int status_led_state; /* current status led state */ +- u8 use_lna; /* sysctl, use LNA when tuning ? */ ++ int use_lna; /* sysctl, use LNA when tuning ? */ + }; + + int sms1xxx_gpio_get_pin_params(u32, u32 *, u32 *, u32 *); +--- sms1xxx-ir.h.orig ++++ sms1xxx-ir.h +@@ -37,9 +37,9 @@ + /* Board IR configuration */ + struct sms1xxx_ir { + /* IR module state */ +- u8 module_avail; /* Has board an IR module ? ++ int module_avail; /* Has board an IR module ? + XXX Should be based on GPIO cfg ? */ +- u8 module_started; /* Is IR module started ? */ ++ int module_started; /* Is IR module started ? */ + struct cdev *dev; /* ir0 device */ + + /* MSG_SMS_START_IR_REQ Msg parameters */ Property changes on: head/multimedia/sms1xxx-kmod/files/patch-8cf5b276 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property