From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 31 21:50:04 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCA0216A406 for ; Sat, 31 Mar 2007 21:50:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 9530F13C4B8 for ; Sat, 31 Mar 2007 21:50:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l2VLo4rR060896 for ; Sat, 31 Mar 2007 21:50:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l2VLo4ZA060889; Sat, 31 Mar 2007 21:50:04 GMT (envelope-from gnats) Resent-Date: Sat, 31 Mar 2007 21:50:04 GMT Resent-Message-Id: <200703312150.l2VLo4ZA060889@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Teemu Korhonen Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8A49416A404 for ; Sat, 31 Mar 2007 21:45:14 +0000 (UTC) (envelope-from venefics@mbnet.fi) Received: from hyatt.suomi.net (hyatt.suomi.net [82.128.152.22]) by mx1.freebsd.org (Postfix) with ESMTP id 3E89F13C44C for ; Sat, 31 Mar 2007 21:45:14 +0000 (UTC) (envelope-from venefics@mbnet.fi) Received: from prolisok.suomi.net ([212.50.140.226]) by hyatt.suomi.net (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JFS009OADEYDQ10@hyatt.suomi.net> for freebsd-gnats-submit@freebsd.org; Sun, 01 Apr 2007 00:08:59 +0300 (EEST) Received: from spam2.suomi.net (spam2.suomi.net [212.50.131.166]) by mailstore.suomi.net (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JFS00DXPDF0IO80@mailstore.suomi.net> for freebsd-gnats-submit@freebsd.org; Sun, 01 Apr 2007 00:09:00 +0300 (EEST) Received: from veneficus.koti.lan (85-23-18-176-Korvensuora-TR1.suomi.net [85.23.18.176]) by spam2.suomi.net (Postfix) with ESMTP id AB71F1941FD for ; Sun, 01 Apr 2007 00:08:43 +0300 (EEST) Received: from veneficus.koti.lan (localhost.koti.lan [127.0.0.1]) by veneficus.koti.lan (8.13.8/8.13.8) with ESMTP id l2VL8SDQ021830 for ; Sun, 01 Apr 2007 00:08:28 +0300 Received: (from teemu@localhost) by veneficus.koti.lan (8.13.8/8.13.8/Submit) id l2VL8S0i021829; Sun, 01 Apr 2007 00:08:28 +0300 (EEST envelope-from teemu) Message-Id: <200703312108.l2VL8S0i021829@veneficus.koti.lan> Date: Sun, 01 Apr 2007 00:08:28 +0300 (EEST) From: Teemu Korhonen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/111076: [patch] multimedia/mplayer: enable joystick support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Teemu Korhonen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2007 21:50:04 -0000 >Number: 111076 >Category: ports >Synopsis: [patch] multimedia/mplayer: enable joystick support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Mar 31 21:50:03 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Teemu Korhonen >Release: FreeBSD 6.2-RELEASE i386 >Organization: >Environment: >Description: MPlayer's joystick support works in FreeBSD with devel/linux-js, but it is disabled if not compiled in linux. This patch adds config-option to enable joystick support (+add dependency to linux-js) and disables linux check for joystick. Files affected on port: Makefile patch-configure (new file) patch-input-joystick.c (new file) >How-To-Repeat: >Fix: --- mplayer-joystick.diff begins here --- diff -ruN mplayer/Makefile mplayer.new/Makefile --- mplayer/Makefile Sat Mar 31 18:23:00 2007 +++ mplayer.new/Makefile Sat Mar 31 16:49:51 2007 @@ -174,6 +174,7 @@ OPTIONS+= LIBCDIO "Enable libcdio support" off OPTIONS+= CDPARANOIA "Enable cdparanoia support" off OPTIONS+= LIBLZO "Enable external liblzo library" off +OPTIONS+= JOYSTICK "Enable joystick support" off .endif WANT_GNOME= yes @@ -584,6 +585,13 @@ DEFAULT_KERN_HZ=${WITH_KERN_HZ} .else DEFAULT_KERN_HZ=1024 +.endif + +.if defined(WITH_JOYSTICK) +BUILD_DEPENDS+= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js +CONFIGURE_ARGS+=--enable-joystick +.else +CONFIGURE_ARGS+=--disable-joystick .endif # "enable" build for other archs diff -ruN mplayer/files/patch-configure mplayer.new/files/patch-configure --- mplayer/files/patch-configure Thu Jan 1 02:00:00 1970 +++ mplayer.new/files/patch-configure Sat Mar 31 15:33:05 2007 @@ -0,0 +1,19 @@ +--- configure.orig Sat Mar 31 04:34:54 2007 ++++ configure Sat Mar 31 15:31:07 2007 +@@ -7362,12 +7362,12 @@ + echocheck "joystick" + _def_joystick='#undef HAVE_JOYSTICK' + if test "$_joystick" = yes ; then +- if linux ; then ++# if linux ; then + # TODO add some check + _def_joystick='#define HAVE_JOYSTICK 1' +- else +- _joystick="no (unsupported under $system_name)" +- fi ++# else ++# _joystick="no (unsupported under $system_name)" ++# fi + fi + echores "$_joystick" + diff -ruN mplayer/files/patch-input-joystick.c mplayer.new/files/patch-input-joystick.c --- mplayer/files/patch-input-joystick.c Thu Jan 1 02:00:00 1970 +++ mplayer.new/files/patch-input-joystick.c Sat Mar 31 05:12:10 2007 @@ -0,0 +1,29 @@ +--- input/joystick.c.orig Sat Mar 31 05:10:08 2007 ++++ input/joystick.c Sat Mar 31 05:09:30 2007 +@@ -24,8 +24,6 @@ + #define JS_DEV "/dev/input/js0" + #endif + +-#ifdef TARGET_LINUX +- + #include + + int axis[256]; +@@ -147,17 +145,3 @@ + return MP_INPUT_NOTHING; + } + +-#else +- +-// dummy function +- +-int mp_input_joystick_init(char* dev) { +- return -1; +-} +- +-int mp_input_joystick_read(int fd) { +- +- return MP_INPUT_NOTHING; +-} +- +-#endif --- mplayer-joystick.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: