--- a/ChangeLog	Sun Jan 20 18:45:03 2008 +0000
+++ b/ChangeLog	Sun Jan 20 19:03:00 2008 +0000
@@ -1,3 +1,9 @@
+2008-01-21 Moinak Ghosh <[email protected]>
+	* encumbered/SFEogle.spec:
+	* patches/ogle-01-mmx.diff:
+	  Fixed ogle build to include libdvdcontrol, add missing dirs to package
+	  Patch to fix MediaLib and MMX usage
+
 2008-01-21 Moinak Ghosh <[email protected]>
 	* SFEgnupg2.spec:
 	* patches/gnupg2-01-asschk.diff:

--- a/encumbered/SFEogle.spec	Sun Jan 20 18:45:03 2008 +0000
+++ b/encumbered/SFEogle.spec	Sun Jan 20 19:03:00 2008 +0000
@@ -11,6 +11,7 @@
 Version:             0.9.2
 Source:              http://www.dtek.chalmers.se/groups/dvd/dist/ogle-%{version}.tar.gz
 URL:                 http://www.dtek.chalmers.se/groups/dvd/
+Patch1:              ogle-01-mmx.diff
 SUNW_BaseDir:        %{_basedir}
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q -n ogle-%{version}
+%patch1 -p1
 
 %build
 
@@ -39,7 +41,7 @@
 fi
 
 export CC=gcc
-export CFLAGS="-O4 -fno-omit-frame-pointer"
+export CFLAGS="-O4 -fno-omit-frame-pointer -I/usr/X11/include"
 export LDFLAGS="%arch_ldadd %ldadd ${EXTRA_LDFLAGS}"
 
 #export CFLAGS="%optflags"
@@ -52,8 +54,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_datadir}
+rm -f $RPM_BUILD_ROOT%{_libdir}/ogle/lib*a
+(cd ogle/.libs/; cp -rP libdvdcontrol.so* $RPM_BUILD_ROOT%{_libdir}/ogle/)
+mv $RPM_BUILD_ROOT%{_libdir}/ogle/libdvdcontrol.so.9.2.0U $RPM_BUILD_ROOT%{_libdir}/ogle/libdvdcontrol.so.9.2.0
 
-rmdir $RPM_BUILD_ROOT%{_bindir}
+#rmdir $RPM_BUILD_ROOT%{_bindir}
 #rmdir $RPM_BUILD_ROOT%{_includedir}
 
 %clean
@@ -63,6 +69,16 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/*
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, sys) %{_datadir}/ogle
+%{_datadir}/ogle/*
+%dir %attr (0755, root, bin) %{_mandir}
+%dir %attr (0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+%dir %attr (0755, root, bin) %{_mandir}/man5
+%{_mandir}/man5/*
 
 %files devel
 %defattr (-, root, bin)
@@ -70,5 +86,8 @@
 %{_includedir}/*
 
 %changelog
+* Sun Jan 21 2008 - [email protected]
+- Fixed ogle build to include libdvdcontrol, add missing dirs to package
+- Patch to fix MediaLib and MMX usage
 * Wed Nov 21 2007 - [email protected]
 - Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ogle-01-mmx.diff	Sun Jan 20 19:03:00 2008 +0000
@@ -0,0 +1,41 @@
+--- ogle-0.9.2/mpeg2_video/yuv2rgb.c.orig	2008-01-02 22:32:20.875282000 +0530
++++ ogle-0.9.2/mpeg2_video/yuv2rgb.c	2008-01-02 22:36:50.382808000 +0530
+@@ -42,14 +42,13 @@
+ 
+ void yuv2rgb_init(uint32_t bpp, uint32_t mode) 
+ {
+-#ifdef HAVE_MMX
++#if defined(HAVE_MLIB)
+   if(1)
+-    yuv2rgb = yuv2rgb_mmx_init(bpp, mode);
++    yuv2rgb = yuv2rgb_mlib_init(bpp, mode);
+   else
+-#endif
+-#ifdef HAVE_MLIB
++#elif defined(HAVE_MMX)
+   if(1)
+-    yuv2rgb = yuv2rgb_mlib_init(bpp, mode);
++    yuv2rgb = yuv2rgb_mmx_init(bpp, mode);
+   else
+ #endif
+     ;
+--- ogle-0.9.2/mpeg2_video/video_stream.c.orig	2008-01-02 22:34:50.663511000 +0530
++++ ogle-0.9.2/mpeg2_video/video_stream.c	2008-01-02 22:36:33.184678000 +0530
+@@ -1002,7 +1002,7 @@
+   data_q->data_elems = data_elems;
+   data_q->image_bufs = image_bufs;
+     
+-#ifdef HAVE_MMX
++#if defined(HAVE_MMX) && !defined(HAVE_MLIB)
+   emms();
+ #endif
+   
+@@ -1717,7 +1717,7 @@
+   DPRINTFI(1, "picture_data()\n");
+   DINDENT(2);
+ 
+-#ifdef HAVE_MMX
++#if defined(HAVE_MMX) && !defined(HAVE_MLIB)
+     emms();
+ #endif
+