|
[-]
[+]
|
Changed |
ffmpeg.spec
|
|
|
|
[-]
[+]
|
Changed |
ffmpeg_configure.diff
^
|
| @@ -1,8 +1,8 @@
---- configure.orig 2009-02-22 01:18:34.000000000 +0100
-+++ configure 2009-02-22 01:30:09.000000000 +0100
-@@ -1894,11 +1894,11 @@
- # ---
- # check availability of some header files
+--- configure.orig 2010-01-28 06:54:50.000000000 +0100
++++ configure 2010-01-28 19:54:29.742794343 +0100
+@@ -2423,11 +2423,11 @@
+
+ fi
-if check_func dlopen; then
- ldl=
@@ -14,52 +14,18 @@
-fi
+#fi
- check_func fork
- check_func gethrtime
-@@ -2137,19 +2137,20 @@
- check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
- check_ldflags -Wl,-Bsymbolic
-
--if enabled small; then
-- check_cflags -Os # not all compilers support -Os
-- optimizations="small"
--elif enabled optimizations; then
-- if enabled xlc; then
-- add_cflags -O5
-- add_ldflags -O5
-- elif enabled ccc; then
-- add_cflags -fast
-- else
-- add_cflags -O3
-- fi
--fi
-+#if enabled small; then
-+# check_cflags -Os # not all compilers support -Os
-+# optimizations="small"
-+#elif enabled optimizations; then
-+# if enabled xlc; then
-+# add_cflags -O5
-+# add_ldflags -O5
-+# elif enabled ccc; then
-+# add_cflags -fast
-+# else
-+# add_cflags -O3
-+# fi
-+#fi
-+add_cflags '${CFLAGS}'
- check_cflags -fno-math-errno
- check_cflags -fno-signed-zeros
-
-@@ -2545,7 +2546,7 @@
+ # Solaris has nanosleep in -lrt, OpenSolaris no longer needs that
+ check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; }
+@@ -3039,7 +3039,7 @@
Conflicts:
- Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
+ Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
Libs.private: $(enabled shared && echo $libs)
-Cflags: -I\${includedir}
+Cflags: -I/usr/include -I/usr/include/$name
EOF
cat <<EOF > $name/$name-uninstalled.pc
prefix=
-@@ -2559,7 +2560,7 @@
+@@ -3053,7 +3053,7 @@
Requires: $requires
Conflicts:
Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
|
|
[-]
[+]
|
Added |
ffmpeg_fix_return.diff
^
|
| @@ -0,0 +1,17 @@
+diff -ur ffmpeg.orig/libswscale/x86/yuv2rgb_template.c ffmpeg/libswscale/x86/yuv2rgb_template.c
+--- ffmpeg.orig/libswscale/x86/yuv2rgb_template.c 2010-01-15 19:54:58.000000000 +0100
++++ ffmpeg/libswscale/x86/yuv2rgb_template.c 2010-03-23 21:35:31.506502288 +0100
+@@ -525,6 +525,7 @@
+ YUV2RGB_ENDLOOP(4)
+ YUV2RGB_OPERANDS_ALPHA
+ #endif
++ return 0;
+ }
+
+ static inline int RENAME(yuv420_bgr32)(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
+@@ -561,4 +562,5 @@
+ YUV2RGB_ENDLOOP(4)
+ YUV2RGB_OPERANDS_ALPHA
+ #endif
++ return 0;
+ }
|
|
|
Deleted |
ffmpeg-0.5-0.pm.3.src.rpm
^
|
|
|
Added |
ffmpeg-0.5.22965svn.tar.bz2
^
|
|
|
Deleted |
ffmpeg-0.5.tar.bz2
^
|
