Attachment 604519 Details for Bug 831336 – Patch against ~/rpmbuild

[patch] Patch against ~/rpmbuild

patch-rpmbuild-tree (text/plain), 7.72 KB, created by Manfred Spraul on 2012-08-15 07:09:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Manfred Spraul

Created: 2012-08-15 07:09:18 UTC

Size: 7.72 KB

patch

obsolete

>diff -urNp orig/SOURCES/freeglut-2.8.0-fixXInput.patch fix/SOURCES/freeglut-2.8.0-fixXInput.patch
>--- orig/SOURCES/freeglut-2.8.0-fixXInput.patch	1970-01-01 01:00:00.000000000 +0100
>+++ fix/SOURCES/freeglut-2.8.0-fixXInput.patch	2012-08-09 15:31:30.911650744 +0200
>@@ -0,0 +1,176 @@
>+--- freeglut-2.8.0/src/freeglut_xinput.c-before	2012-08-09 15:19:24.201786724 +0200
>++++ freeglut-2.8.0/src/freeglut_xinput.c	2012-08-09 15:19:28.219736211 +0200
>+@@ -143,72 +143,120 @@ void fgPrintXIDeviceEvent(XIDeviceEvent*
>+  * \brief This function is called when an Extension Event is received
>+  * and calls the corresponding callback functions for these events.
>+  */
>+-void fgHandleExtensionEvents( XEvent* base_ev ) {
>+-
>++void fgHandleExtensionEvents( XEvent* base_ev )
>++{
>++	XEvent std_ev;	/* standard single-pointer event to be added to the event queue */
>+ 	int i, button = 0;
>+ 	XGenericEventCookie* cookie = (XGenericEventCookie*)&(base_ev->xcookie);
>+ 
>++	/* initialize the generic fields from base_ev */
>++	std_ev.xany = base_ev->xany;
>++
>+ 	if ( XGetEventData( fgDisplay.Display, cookie ) && (cookie->type == GenericEvent) && (cookie->extension == xi_opcode) ) {
>+ 
>+ 		XIDeviceEvent* event = (XIDeviceEvent*)(cookie->data);
>++		XIEnterEvent *evcross;
>+ 		/*printf("XI2 event type: %d - %d\n", cookie->evtype, event->type );*/
>+ 
>+ 		SFG_Window* window = fgWindowByHandle( event->event );
>+ 		if (!window) return;
>+ 
>+ 		switch (cookie->evtype) {
>+-
>+-			case XI_Enter:
>+-			case XI_Leave:
>+-				fgState.Modifiers = fghGetXModifiers( ((XIEnterEvent*)event)->mods.base );
>+-				INVOKE_WCB( *window, MultiEntry, (
>+-					event->deviceid, 
>+-					(event->evtype == XI_Enter ? GLUT_ENTERED : GLUT_LEFT)
>+-				));
>+-				#if _DEBUG
>+-					fgPrintXILeaveEvent((XILeaveEvent*)event);
>+-				#endif
>+-				break;
>+-
>+-			case XI_ButtonPress:
>+-			case XI_ButtonRelease:
>+-				fgState.Modifiers = fghGetXModifiers( event->mods.base );
>+-				INVOKE_WCB( *window, MultiButton, (
>+-					event->deviceid, 
>+-					event->event_x,
>+-					event->event_y,
>+-					(event->detail)-1, 
>+-					(event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP)
>+-				));
>+-				INVOKE_WCB( *window, Mouse, (
>+-					(event->detail)-1, 
>+-					(event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP),
>+-					event->event_x,
>+-					event->event_y
>+-				));
>+-				break;
>+-
>+-			case XI_Motion:
>+-				fgState.Modifiers = fghGetXModifiers( event->mods.base );
>+-				for (i = 0; i < event->buttons.mask_len; i++) if (event->buttons.mask[i]) button = 1;
>+-				if (button) {
>+-					INVOKE_WCB( *window, MultiMotion,  ( event->deviceid, event->event_x, event->event_y ) );
>+-					INVOKE_WCB( *window,           Motion,  (                  event->event_x, event->event_y ) );
>+-				} else {
>+-					INVOKE_WCB( *window, MultiPassive, ( event->deviceid, event->event_x, event->event_y ) );
>+-					INVOKE_WCB( *window,           Passive, (                  event->event_x, event->event_y ) );
>++		case XI_Enter:
>++		case XI_Leave:
>++			evcross = (XIEnterEvent*)event;
>++
>++			fgState.Modifiers = fghGetXModifiers( evcross->mods.base );
>++			INVOKE_WCB( *window, MultiEntry, (
>++				event->deviceid,
>++				(event->evtype == XI_Enter ? GLUT_ENTERED : GLUT_LEFT)
>++			));
>++			#if _DEBUG
>++			fgPrintXILeaveEvent((XILeaveEvent*)event);
>++			#endif
>++
>++			/* Also process the standard crossing event */
>++			std_ev.type = evcross->evtype == XI_Enter ? EnterNotify : LeaveNotify;
>++			std_ev.xcrossing.window = evcross->event;
>++			std_ev.xcrossing.root = evcross->root;
>++			std_ev.xcrossing.subwindow = evcross->child;
>++			std_ev.xcrossing.x = evcross->event_x;
>++			std_ev.xcrossing.y = evcross->event_y;
>++			std_ev.xcrossing.x_root = evcross->root_x;
>++			std_ev.xcrossing.y_root = evcross->root_y;
>++			std_ev.xcrossing.mode = evcross->mode;
>++			std_ev.xcrossing.detail = evcross->detail;
>++			std_ev.xcrossing.same_screen = evcross->same_screen;
>++			std_ev.xcrossing.focus = evcross->focus;
>++			std_ev.xcrossing.state = *(unsigned int*)evcross->buttons.mask;
>++
>++			XPutBackEvent(fgDisplay.Display, &std_ev);
>++			break;
>++
>++		case XI_ButtonPress:
>++		case XI_ButtonRelease:
>++			fgState.Modifiers = fghGetXModifiers( event->mods.base );
>++			INVOKE_WCB( *window, MultiButton, (
>++				event->deviceid,
>++				event->event_x,
>++				event->event_y,
>++				event->detail-1,
>++				(event->evtype == XI_ButtonPress ? GLUT_DOWN : GLUT_UP)
>++			));
>++
>++			/* Also process the standard button event */
>++			std_ev.type = event->evtype == XI_ButtonPress ? ButtonPress : ButtonRelease;
>++			std_ev.xbutton.window = event->event;
>++			std_ev.xbutton.root = event->root;
>++			std_ev.xbutton.subwindow = event->child;
>++			std_ev.xbutton.x = event->event_x;
>++			std_ev.xbutton.y = event->event_y;
>++			std_ev.xbutton.x_root = event->root_x;
>++			std_ev.xbutton.y_root = event->root_y;
>++			std_ev.xbutton.state = *(unsigned int*)event->buttons.mask;
>++			std_ev.xbutton.button = event->detail;
>++
>++			XPutBackEvent(fgDisplay.Display, &std_ev);
>++			break;
>++
>++		case XI_Motion:
>++			fgState.Modifiers = fghGetXModifiers( event->mods.base );
>++			for (i = 0; i < event->buttons.mask_len; i++) {
>++				if (event->buttons.mask[i]) {
>++					button = 1;
>+ 				}
>+-				#if _DEBUG
>+-					fgPrintXIDeviceEvent(event);
>+-				#endif
>+-				break;
>+-
>+-			default:
>+-				#if _DEBUG
>+-					fgWarning( "Unknown XI2 device event:" );
>+-					fgPrintXIDeviceEvent( event );
>+-				#endif
>+-				break;
>++			}
>++			if (button) {
>++				INVOKE_WCB( *window, MultiMotion,  ( event->deviceid, event->event_x, event->event_y ) );
>++			} else {
>++				INVOKE_WCB( *window, MultiPassive, ( event->deviceid, event->event_x, event->event_y ) );
>++			}
>++			#if _DEBUG
>++			fgPrintXIDeviceEvent(event);
>++			#endif
>++
>++			/* Also process the standard motion event */
>++			std_ev.type = MotionNotify;
>++			std_ev.xmotion.window = event->event;
>++			std_ev.xmotion.root = event->root;
>++			std_ev.xmotion.subwindow = event->child;
>++			std_ev.xmotion.time = event->time;
>++			std_ev.xmotion.x = event->event_x;
>++			std_ev.xmotion.y = event->event_y;
>++			std_ev.xmotion.x_root = event->root_x;
>++			std_ev.xmotion.y_root = event->root_y;
>++			std_ev.xmotion.state = *(unsigned int*)event->buttons.mask;
>++			std_ev.xmotion.is_hint = NotifyNormal;
>++
>++			XPutBackEvent(fgDisplay.Display, &std_ev);
>++			break;
>++
>++		default:
>++			#if _DEBUG
>++			fgWarning( "Unknown XI2 device event:" );
>++			fgPrintXIDeviceEvent( event );
>++			#endif
>++			break;
>+ 		}
>+ 		fgState.Modifiers = INVALID_MODIFIERS;
>+ 	}
>diff -urNp orig/SPECS/freeglut.spec fix/SPECS/freeglut.spec
>--- orig/SPECS/freeglut.spec	2012-01-14 00:14:14.000000000 +0100
>+++ fix/SPECS/freeglut.spec	2012-08-09 15:32:53.487612622 +0200
>@@ -1,7 +1,7 @@
> Summary:        A freely licensed alternative to the GLUT library
> Name:           freeglut
> Version:        2.8.0
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> URL:            http://freeglut.sourceforge.net
> Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
> # For the manpages
>@@ -22,6 +22,7 @@ Obsoletes:      glut < 3.7
> # Fix linking of the examples -- we don't package them, they just need to
> # compile and link
> Patch0: freeglut-2.8.0-fixld.patch
>+Patch1: freeglut-2.8.0-fixXInput.patch
> 
> %description
> freeglut is a completely open source alternative to the OpenGL Utility Toolkit
>@@ -53,6 +54,7 @@ license.
> %prep
> %setup -q -a 1
> %patch0 -p1 -b .fixld
>+%patch1 -p1 -b .fixXinput
> 
> %build
> # --disable-warnings -> don't add -Werror to CFLAGS
>@@ -91,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Thu Aug 09 2012 Manfred Spraul <manfred@colorfullife.com> - 2.8.0-4
>+- Fix bug report #831336
>+- based on Refivision 1375 from upstream SVN repository
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.0-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 831336: 592422 | 604516 | 604519