|
[-]
[+]
|
Changed |
ffmpeg.spec
|
|
|
|
[-]
[+]
|
Changed |
ffmpeg_configure.diff
^
|
| @@ -1,6 +1,6 @@
---- configure.orig 2008-06-15 21:30:34.000000000 +0200
-+++ configure 2008-06-15 21:38:50.000000000 +0200
-@@ -1590,11 +1590,11 @@
+--- 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
@@ -16,30 +16,50 @@
check_func fork
check_func gethrtime
-@@ -1838,10 +1838,10 @@
- optimizations="small"
- elif enabled optimizations; then
- if $cc -v 2>&1 | grep -q xlc; then
-- add_cflags "-O5"
-+# add_cflags "-O5"
- add_ldflags "-O5"
+@@ -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"
+- 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 -O3
++# fi
++#fi
++add_cflags '${CFLAGS}'
check_cflags -fno-math-errno
-@@ -2206,7 +2206,7 @@
+ check_cflags -fno-signed-zeros
+
+@@ -2545,7 +2546,7 @@
Conflicts:
Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
Libs.private: $(enabled shared && echo $libs)
-Cflags: -I\${includedir}
+Cflags: -I/usr/include -I/usr/include/$name
EOF
- cat <<EOF > $name-uninstalled.pc
+ cat <<EOF > $name/$name-uninstalled.pc
prefix=
-@@ -2220,7 +2220,7 @@
+@@ -2559,7 +2560,7 @@
Requires: $requires
Conflicts:
Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
|
|
|
Added |
ffmpeg-0.5-0.pm.3.src.rpm
^
|
|
|
Changed |
ffmpeg-0.5.tar.bz2
^
|
