Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/ogle-01-mmx.diff
author moinakg
Sun, 20 Jan 2008 19:03:00 +0000
changeset 809 13a4a3e79cf5
permissions -rw-r--r--
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
809
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
     1
 
--- ogle-0.9.2/mpeg2_video/yuv2rgb.c.orig	2008-01-02 22:32:20.875282000 +0530
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
     2
 
+++ ogle-0.9.2/mpeg2_video/yuv2rgb.c	2008-01-02 22:36:50.382808000 +0530
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
     3
 
@@ -42,14 +42,13 @@
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
     4
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
     5
 
 void yuv2rgb_init(uint32_t bpp, uint32_t mode)
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
     6
 
 {
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
     7
 
-#ifdef HAVE_MMX
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
     8
 
+#if defined(HAVE_MLIB)
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
     9
 
   if(1)
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    10
 
-    yuv2rgb = yuv2rgb_mmx_init(bpp, mode);
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    11
 
+    yuv2rgb = yuv2rgb_mlib_init(bpp, mode);
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    12
 
   else
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    13
 
-#endif
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    14
 
-#ifdef HAVE_MLIB
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    15
 
+#elif defined(HAVE_MMX)
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    16
 
   if(1)
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    17
 
-    yuv2rgb = yuv2rgb_mlib_init(bpp, mode);
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    18
 
+    yuv2rgb = yuv2rgb_mmx_init(bpp, mode);
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    19
 
   else
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    20
 
 #endif
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    21
 
     ;
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    22
 
--- ogle-0.9.2/mpeg2_video/video_stream.c.orig	2008-01-02 22:34:50.663511000 +0530
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    23
 
+++ ogle-0.9.2/mpeg2_video/video_stream.c	2008-01-02 22:36:33.184678000 +0530
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    24
 
@@ -1002,7 +1002,7 @@
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    25
 
   data_q->data_elems = data_elems;
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    26
 
   data_q->image_bufs = image_bufs;
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    27
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    28
 
-#ifdef HAVE_MMX
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    29
 
+#if defined(HAVE_MMX) && !defined(HAVE_MLIB)
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    30
 
   emms();
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    31
 
 #endif
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    32
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    33
 
@@ -1717,7 +1717,7 @@
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    34
 
   DPRINTFI(1, "picture_data()\n");
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    35
 
   DINDENT(2);
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    36
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    37
 
-#ifdef HAVE_MMX
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    38
 
+#if defined(HAVE_MMX) && !defined(HAVE_MLIB)
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    39
 
     emms();
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    40
 
 #endif
13a4a3e79cf5 encumbered/SFEogle.spec:
moinakg
parents:
diff changeset 
    41
upstream/spec-files-extra