summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-10-14 00:36:14 +0000
committerMike Frysinger <vapier@gentoo.org>2005-10-14 00:36:14 +0000
commit23e1e038a44be3643f62864d2ae898a453dcc8ce (patch)
tree90da954c14ea421373412c924e7dfafb1bfe5d30 /media-video/SDLcam/files
parentadd support for USE=nls to fix uClibc systems #109143 by Jens Pranaitis (diff)
downloadhistorical-23e1e038a44be3643f62864d2ae898a453dcc8ce.tar.gz
historical-23e1e038a44be3643f62864d2ae898a453dcc8ce.tar.bz2
historical-23e1e038a44be3643f62864d2ae898a453dcc8ce.zip
Add tsc fix by Tobias Klausmann #109161.
Package-Manager: portage-2.0.53_rc5
Diffstat (limited to 'media-video/SDLcam/files')
-rw-r--r--media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch21
-rw-r--r--media-video/SDLcam/files/SDLcam-0.7.3-tsc.patch51
-rw-r--r--media-video/SDLcam/files/digest-SDLcam-0.7.3-r21
3 files changed, 73 insertions, 0 deletions
diff --git a/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch b/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch
new file mode 100644
index 000000000000..c63678985c58
--- /dev/null
+++ b/media-video/SDLcam/files/SDLcam-0.7.3-prototypes.patch
@@ -0,0 +1,21 @@
+--- SDL_v4l_filters_thomas.h
++++ SDL_v4l_filters_thomas.h
+@@ -18,6 +18,7 @@
+ */
+ #ifndef FILTER_THOMAS_H
+ #define FILTER_THOMAS_H
++#include <sys/types.h>
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -29,8 +30,8 @@
+ #ifdef MMX
+ int MMX_add_sub_shr (unsigned char *bild, unsigned char *buf, unsigned short *summe, unsigned int len, unsigned int shr);
+ #endif
+-void yuv420p_to_rgb32(unsigned int width,unsigned int height,unsigned char *y,unsigned char *u,unsigned char *v,unsigned char *d);
+-void yuv420p_to_bgr32(unsigned int width,unsigned int height,unsigned char *y,unsigned char *u,unsigned char *v,unsigned char *d);
++void yuv420p_to_rgb32(size_t width,size_t height,unsigned char *y,unsigned char *u,unsigned char *v,unsigned char *d);
++void yuv420p_to_bgr32(size_t width,size_t height,unsigned char *y,unsigned char *u,unsigned char *v,unsigned char *d);
+ void SDL_v4l_Reorder_cleanup (void);
+ int SDL_v4l_Reorder (const SDL_v4l_image *SRC, SDL_v4l_image *DST,int off_x,int off_y,int typ,int radius,double effekt);
+ #ifdef __cplusplus
diff --git a/media-video/SDLcam/files/SDLcam-0.7.3-tsc.patch b/media-video/SDLcam/files/SDLcam-0.7.3-tsc.patch
new file mode 100644
index 000000000000..807667b22a5d
--- /dev/null
+++ b/media-video/SDLcam/files/SDLcam-0.7.3-tsc.patch
@@ -0,0 +1,51 @@
+Patch by Tobias Klausmann to fix TSC issues on Pentium M's
+
+http://bugs.gentoo.org/109161
+
+--- misc.c
++++ misc.c
+@@ -25,6 +25,11 @@
+ #include "dyn_misc.h"
+ #include "misc.h"
+
++#define rdtsc(low,high) \
++ __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high))
++
++
++
+ char *xStrdup (const char *t) {{{
+ char *ret;
+ ret = strdup (t);
+@@ -42,18 +47,9 @@
+
+ void getTimeStampCounter ( TimeStampCounter *t ) {{{
+ #ifdef TIMER
+- unsigned int h=t->high;
+- unsigned int l=t->low ;
+- asm (
+- "push %%eax \n"
+- "push %%edx \n"
+- "rdtsc \n"
+- "movl %%eax,%1 \n"
+- "movl %%edx,%0 \n"
+- "pop %%edx \n"
+- "pop %%edx \n"
+- : "=m" (h) , "=m" (l)
+- );
++ unsigned long h=t->high;
++ unsigned long l=t->low ;
++ rdtsc(l,h);
+ t->high = h;
+ t->low = l;
+ #else
+--- misc.h.orig 2005-10-08 13:52:05.000000000 +0200
++++ misc.h 2005-10-08 13:52:18.000000000 +0200
+@@ -24,7 +24,7 @@
+
+ char *xStrdup (const char *t);
+
+-typedef struct { unsigned int high, low; } TimeStampCounter;
++typedef struct { unsigned long high, low; } TimeStampCounter;
+ void getTimeStampCounter ( TimeStampCounter *t );
+ void Start_Timer (unsigned int idx);
+ void Ende_Timer (unsigned int idx);
diff --git a/media-video/SDLcam/files/digest-SDLcam-0.7.3-r2 b/media-video/SDLcam/files/digest-SDLcam-0.7.3-r2
new file mode 100644
index 000000000000..a9c2256dddd8
--- /dev/null
+++ b/media-video/SDLcam/files/digest-SDLcam-0.7.3-r2
@@ -0,0 +1 @@
+MD5 82b7d7e7e6f4d6fe1cd2c4ab97232fd8 SDLcam-0.7.3.tar.gz 299421