rpms/bsnes/F-10 bsnes-0.054-noppcelfppc64.patch, NONE, 1.1 libco.ppc-elf-2.diff, NONE, 1.1 bsnes.spec, 1.18, 1.19 bsnes-0.054-noppcelf.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8558
Modified Files:
bsnes.spec
Added Files:
bsnes-0.054-noppcelfppc64.patch libco.ppc-elf-2.diff
Removed Files:
bsnes-0.054-noppcelf.patch
Log Message:
* Wed Oct 28 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.054-2
- Fixed the ppc-elf issue properly
bsnes-0.054-noppcelfppc64.patch:
--- NEW FILE bsnes-0.054-noppcelfppc64.patch ---
diff -up bsnes-0.054/src/lib/libco/libco.c.noppcelfppc64 bsnes-0.054/src/lib/libco/libco.c
--- bsnes-0.054/src/lib/libco/libco.c.noppcelfppc64 2009-10-18 09:26:09.000000000 +0200
+++ bsnes-0.054/src/lib/libco/libco.c 2009-10-28 20:17:02.000000000 +0100
@@ -8,7 +8,7 @@
#include "x86.c"
#elif defined(__GNUC__) && defined(__amd64__)
#include "amd64.c"
-#elif defined(__GNUC__) && defined(__powerpc__) && defined(__ELF__)
+#elif defined(__GNUC__) && defined(__PPC32__) && defined(__ELF__)
#include "ppc-elf.c"
#elif defined(__GNUC__)
#include "sjlj.c"
libco.ppc-elf-2.diff:
--- NEW FILE libco.ppc-elf-2.diff ---
--- libco.orig/ppc-elf.c Sat Oct 10 22:11:16 2009
+++ libco/ppc-elf.c Wed Oct 28 12:30:19 2009
@@ -66,9 +66,15 @@
/*
* co_active_context is either in a global offset table (if we are
* compiling -fPIC or -fPIE) or has an absolute position.
+ *
+ * __attribute__((__used__)) is necessary because newer versions of
+ * gcc might replace co_active_context with an inline constant. This
+ * optimization would cause a linker error. This is because gcc cannot
+ * detect that our __asm__ uses co_active_context.
*/
static void *co_main_stack_pointer;
-static cothread_t co_active_context = &co_main_stack_pointer;
+static cothread_t co_active_context __attribute__((__used__)) =
+ &co_main_stack_pointer;
extern cothread_t co_active() {
return co_active_context;
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-10/bsnes.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bsnes.spec 21 Oct 2009 16:15:37 -0000 1.18
+++ bsnes.spec 28 Oct 2009 19:42:59 -0000 1.19
@@ -2,7 +2,7 @@
Name: bsnes
Version: 0.%{vernumber}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: SNES emulator focused on accuracy
Group: Applications/Emulators
@@ -13,7 +13,8 @@
Source0: %{name}_v%{vernumber}.tar.bz2
Source2: README.bsnes
Patch0: bsnes-0.037a-strip.patch
-Patch1: bsnes-0.054-noppcelf.patch
+Patch1: libco.ppc-elf-2.diff
+Patch2: bsnes-0.054-noppcelfppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#bsnes does not use system snes_ntsc because the modified video processing
@@ -39,7 +40,10 @@
%prep
%setup -qc
%patch0 -p0 -b .strip
-%patch1 -p1 -b .noppcelf
+pushd src/lib/libco
+%patch1 -p1 -b .newppcelf
+popd
+%patch2 -p1 -b .noppcelfppc64
#fix permissions
find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
@@ -79,6 +83,9 @@
%changelog
+* Wed Oct 28 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.054-2
+- Fixed the ppc-elf issue properly
+
* Wed Oct 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.054-1
- Updated to 0.054
- Disabled ppc-elf.c until we figure out why it does not build
--- bsnes-0.054-noppcelf.patch DELETED ---
14 years, 5 months
rpms/bsnes/F-11 bsnes-0.054-noppcelfppc64.patch, NONE, 1.1 libco.ppc-elf-2.diff, NONE, 1.1 bsnes.spec, 1.20, 1.21 bsnes-0.054-noppcelf.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8127
Modified Files:
bsnes.spec
Added Files:
bsnes-0.054-noppcelfppc64.patch libco.ppc-elf-2.diff
Removed Files:
bsnes-0.054-noppcelf.patch
Log Message:
* Wed Oct 28 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.054-2
- Fixed the ppc-elf issue properly
bsnes-0.054-noppcelfppc64.patch:
--- NEW FILE bsnes-0.054-noppcelfppc64.patch ---
diff -up bsnes-0.054/src/lib/libco/libco.c.noppcelfppc64 bsnes-0.054/src/lib/libco/libco.c
--- bsnes-0.054/src/lib/libco/libco.c.noppcelfppc64 2009-10-18 09:26:09.000000000 +0200
+++ bsnes-0.054/src/lib/libco/libco.c 2009-10-28 20:17:02.000000000 +0100
@@ -8,7 +8,7 @@
#include "x86.c"
#elif defined(__GNUC__) && defined(__amd64__)
#include "amd64.c"
-#elif defined(__GNUC__) && defined(__powerpc__) && defined(__ELF__)
+#elif defined(__GNUC__) && defined(__PPC32__) && defined(__ELF__)
#include "ppc-elf.c"
#elif defined(__GNUC__)
#include "sjlj.c"
libco.ppc-elf-2.diff:
--- NEW FILE libco.ppc-elf-2.diff ---
--- libco.orig/ppc-elf.c Sat Oct 10 22:11:16 2009
+++ libco/ppc-elf.c Wed Oct 28 12:30:19 2009
@@ -66,9 +66,15 @@
/*
* co_active_context is either in a global offset table (if we are
* compiling -fPIC or -fPIE) or has an absolute position.
+ *
+ * __attribute__((__used__)) is necessary because newer versions of
+ * gcc might replace co_active_context with an inline constant. This
+ * optimization would cause a linker error. This is because gcc cannot
+ * detect that our __asm__ uses co_active_context.
*/
static void *co_main_stack_pointer;
-static cothread_t co_active_context = &co_main_stack_pointer;
+static cothread_t co_active_context __attribute__((__used__)) =
+ &co_main_stack_pointer;
extern cothread_t co_active() {
return co_active_context;
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/F-11/bsnes.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bsnes.spec 21 Oct 2009 16:14:56 -0000 1.20
+++ bsnes.spec 28 Oct 2009 19:42:42 -0000 1.21
@@ -2,7 +2,7 @@
Name: bsnes
Version: 0.%{vernumber}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: SNES emulator focused on accuracy
Group: Applications/Emulators
@@ -13,7 +13,8 @@
Source0: %{name}_v%{vernumber}.tar.bz2
Source2: README.bsnes
Patch0: bsnes-0.037a-strip.patch
-Patch1: bsnes-0.054-noppcelf.patch
+Patch1: libco.ppc-elf-2.diff
+Patch2: bsnes-0.054-noppcelfppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#bsnes does not use system snes_ntsc because the modified video processing
@@ -39,7 +40,10 @@
%prep
%setup -qc
%patch0 -p0 -b .strip
-%patch1 -p1 -b .noppcelf
+pushd src/lib/libco
+%patch1 -p1 -b .newppcelf
+popd
+%patch2 -p1 -b .noppcelfppc64
#fix permissions
find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
@@ -79,6 +83,9 @@
%changelog
+* Wed Oct 28 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.054-2
+- Fixed the ppc-elf issue properly
+
* Wed Oct 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.054-1
- Updated to 0.054
- Disabled ppc-elf.c until we figure out why it does not build
--- bsnes-0.054-noppcelf.patch DELETED ---
14 years, 5 months
rpms/bsnes/devel bsnes-0.054-noppcelfppc64.patch, NONE, 1.1 bsnes.spec, 1.22, 1.23
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6955
Modified Files:
bsnes.spec
Added Files:
bsnes-0.054-noppcelfppc64.patch
Log Message:
Don't use ppc-elf.c on ppc64
bsnes-0.054-noppcelfppc64.patch:
--- NEW FILE bsnes-0.054-noppcelfppc64.patch ---
diff -up bsnes-0.054/src/lib/libco/libco.c.noppcelfppc64 bsnes-0.054/src/lib/libco/libco.c
--- bsnes-0.054/src/lib/libco/libco.c.noppcelfppc64 2009-10-18 09:26:09.000000000 +0200
+++ bsnes-0.054/src/lib/libco/libco.c 2009-10-28 20:17:02.000000000 +0100
@@ -8,7 +8,7 @@
#include "x86.c"
#elif defined(__GNUC__) && defined(__amd64__)
#include "amd64.c"
-#elif defined(__GNUC__) && defined(__powerpc__) && defined(__ELF__)
+#elif defined(__GNUC__) && defined(__PPC32__) && defined(__ELF__)
#include "ppc-elf.c"
#elif defined(__GNUC__)
#include "sjlj.c"
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bsnes.spec 28 Oct 2009 18:35:09 -0000 1.22
+++ bsnes.spec 28 Oct 2009 19:20:18 -0000 1.23
@@ -14,6 +14,7 @@
Source2: README.bsnes
Patch0: bsnes-0.037a-strip.patch
Patch1: libco.ppc-elf-2.diff
+Patch2: bsnes-0.054-noppcelfppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#bsnes does not use system snes_ntsc because the modified video processing
@@ -40,8 +41,9 @@
%setup -qc
%patch0 -p0 -b .strip
pushd src/lib/libco
-%patch1 -p1 -b .noppcelf
+%patch1 -p1 -b .newppcelf
popd
+%patch2 -p1 -b .noppcelfppc64
#fix permissions
find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
14 years, 5 months
rpms/bsnes/devel libco.ppc-elf-2.diff, NONE, 1.1 bsnes.spec, 1.21, 1.22 bsnes-0.054-noppcelf.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/bsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4325
Modified Files:
bsnes.spec
Added Files:
libco.ppc-elf-2.diff
Removed Files:
bsnes-0.054-noppcelf.patch
Log Message:
* Wed Oct 28 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.054-2
- Fixed the ppc-elf issue properly
libco.ppc-elf-2.diff:
--- NEW FILE libco.ppc-elf-2.diff ---
--- libco.orig/ppc-elf.c Sat Oct 10 22:11:16 2009
+++ libco/ppc-elf.c Wed Oct 28 12:30:19 2009
@@ -66,9 +66,15 @@
/*
* co_active_context is either in a global offset table (if we are
* compiling -fPIC or -fPIE) or has an absolute position.
+ *
+ * __attribute__((__used__)) is necessary because newer versions of
+ * gcc might replace co_active_context with an inline constant. This
+ * optimization would cause a linker error. This is because gcc cannot
+ * detect that our __asm__ uses co_active_context.
*/
static void *co_main_stack_pointer;
-static cothread_t co_active_context = &co_main_stack_pointer;
+static cothread_t co_active_context __attribute__((__used__)) =
+ &co_main_stack_pointer;
extern cothread_t co_active() {
return co_active_context;
Index: bsnes.spec
===================================================================
RCS file: /cvs/free/rpms/bsnes/devel/bsnes.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bsnes.spec 21 Oct 2009 14:04:31 -0000 1.21
+++ bsnes.spec 28 Oct 2009 18:35:09 -0000 1.22
@@ -2,7 +2,7 @@
Name: bsnes
Version: 0.%{vernumber}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: SNES emulator focused on accuracy
Group: Applications/Emulators
@@ -13,7 +13,7 @@
Source0: %{name}_v%{vernumber}.tar.bz2
Source2: README.bsnes
Patch0: bsnes-0.037a-strip.patch
-Patch1: bsnes-0.054-noppcelf.patch
+Patch1: libco.ppc-elf-2.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#bsnes does not use system snes_ntsc because the modified video processing
@@ -39,7 +39,9 @@
%prep
%setup -qc
%patch0 -p0 -b .strip
+pushd src/lib/libco
%patch1 -p1 -b .noppcelf
+popd
#fix permissions
find src -type f \( -name \*.cpp -or -name \*.hpp -or -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
@@ -79,6 +81,9 @@
%changelog
+* Wed Oct 28 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.054-2
+- Fixed the ppc-elf issue properly
+
* Wed Oct 21 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.054-1
- Updated to 0.054
- Disabled ppc-elf.c until we figure out why it does not build
--- bsnes-0.054-noppcelf.patch DELETED ---
14 years, 5 months
rpms/picard-freeworld/devel .cvsignore, 1.2, 1.3 picard-freeworld.spec, 1.3, 1.4 sources, 1.2, 1.3
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/picard-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21951
Modified Files:
.cvsignore picard-freeworld.spec sources
Log Message:
- Update to 0.12
- Drop SSE2 patch, now applied upstream, hopefully fixes #678:
http://bugs.musicbrainz.org/ticket/5263
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Jan 2009 02:43:45 -0000 1.2
+++ .cvsignore 28 Oct 2009 04:18:39 -0000 1.3
@@ -1 +1 @@
-picard-0.11.tar.gz
+picard-0.12.tar.gz
Index: picard-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/devel/picard-freeworld.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- picard-freeworld.spec 23 Jun 2009 08:18:16 -0000 1.3
+++ picard-freeworld.spec 28 Oct 2009 04:18:39 -0000 1.4
@@ -2,14 +2,13 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: picard-freeworld
-Version: 0.11
-Release: 6%{?dist}
+Version: 0.12
+Release: 1%{?dist}
Summary: Acoustic fingerprinting for Picard tagger
Group: Applications/Multimedia
Source0: http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-%{version}.tar.gz
Patch0: %{name}-0.11-avsetup.patch
-Patch1: %{name}-sse2-align.patch
License: GPLv2+
Url: http://musicbrainz.org/doc/PicardTagger
@@ -32,7 +31,6 @@
%prep
%setup -q -n picard-%{version}
%patch0 -p0
-%patch1 -p1
%build
env %{__python} setup.py config
@@ -56,6 +54,11 @@
%{python_sitearch}/picard/musicdns/avcodec.so
%changelog
+* Wed Oct 28 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.12-1
+- Update to 0.12
+- Drop SSE2 patch, now applied upstream, hopefully fixes #678:
+ http://bugs.musicbrainz.org/ticket/5263
+
* Tue Jun 23 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.11-6
- Patch to fix segfaults using SSE2 (#678)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Jan 2009 02:43:45 -0000 1.2
+++ sources 28 Oct 2009 04:18:39 -0000 1.3
@@ -1 +1 @@
-02ddcff3e201b2cf54f1b52b02d44fad picard-0.11.tar.gz
+88284fb378462a091a092e03387f0da9 picard-0.12.tar.gz
14 years, 5 months
rpms/vlc/devel vlc.spec,1.68,1.69
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv530
Modified Files:
vlc.spec
Log Message:
Rebuild for x264
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vlc.spec 25 Oct 2009 16:55:51 -0000 1.68
+++ vlc.spec 27 Oct 2009 22:10:08 -0000 1.69
@@ -8,7 +8,7 @@
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
Version: 1.0.3
-Release: 0.1_rc%{?dist}
+Release: 0.2_rc%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -96,6 +96,7 @@
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libmusicbrainz-devel
+BuildRequires: libshout-devel
BuildRequires: lua-devel
BuildRequires: minizip-devel
BuildRequires: mpeg2dec-devel >= 0.3.2
@@ -283,6 +284,7 @@
--enable-theora \
--enable-dirac \
--enable-libass \
+ --enable-shout \
--enable-xcb \
--enable-svg \
--enable-snapshot \
@@ -530,6 +532,9 @@
%changelog
+* Tue Oct 27 2009 kwizart < kwizart at gmail.com > - 1.0.3.0.2_rc
+- Rebuild for x264
+
* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.3.0.1_rc
- Update to 1.0.3-rc
- Update bugfix to 20091025
14 years, 5 months
rpms/libquicktime/devel libquicktime-1.1.3-x264_b78.patch, NONE, 1.1 libquicktime.spec, 1.11, 1.12
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31771
Modified Files:
libquicktime.spec
Added Files:
libquicktime-1.1.3-x264_b78.patch
Log Message:
- backport patch from Alexis Ballier.
libquicktime-1.1.3-x264_b78.patch:
--- NEW FILE libquicktime-1.1.3-x264_b78.patch ---
diff -up libquicktime-1.1.3/plugins/x264/lqt_x264.c.b78 libquicktime-1.1.3/plugins/x264/lqt_x264.c
--- libquicktime-1.1.3/plugins/x264/lqt_x264.c.b78 2008-12-06 15:03:10.000000000 +0100
+++ libquicktime-1.1.3/plugins/x264/lqt_x264.c 2009-10-27 22:44:02.792431855 +0100
@@ -94,6 +94,17 @@ static lqt_parameter_info_static_t encod
.val_max = { .val_int = 100 },
.help_string = TRS("Influences how often B-frames are used"),
},
+#if X264_BUILD >= 78
+ {
+ .name = "x264_i_bframe_pyramid",
+ .real_name = TRS("B-frame pyramid"),
+ .type = LQT_PARAMETER_INT,
+ .val_default = { .val_int = 0 },
+ .val_min = { .val_int = 0 },
+ .val_max = { .val_int = 2 },
+ .help_string = TRS("Keep some B-frames as references")
+ },
+#else
{
.name = "x264_b_bframe_pyramid",
.real_name = TRS("B-frame pyramid"),
@@ -103,6 +114,7 @@ static lqt_parameter_info_static_t encod
.val_max = { .val_int = 1 },
.help_string = TRS("Keep some B-frames as references")
},
+#endif
{
.name = "x264_ratecontrol",
.real_name = TRS("Ratecontrol"),
@@ -537,3 +549,4 @@ LQT_EXTERN lqt_init_video_codec_func_t g
}
return (lqt_init_video_codec_func_t)0;
}
+
diff -up libquicktime-1.1.3/plugins/x264/x264.c.b78 libquicktime-1.1.3/plugins/x264/x264.c
--- libquicktime-1.1.3/plugins/x264/x264.c.b78 2009-03-11 15:25:50.000000000 +0100
+++ libquicktime-1.1.3/plugins/x264/x264.c 2009-10-27 22:44:14.134432973 +0100
@@ -67,7 +67,11 @@ static void dump_params(x264_param_t * p
lqt_dump(" i_bframe: %d\n", params->i_bframe); // 0.. X264_BFRAME_MAX
lqt_dump(" b_bframe_adaptive: %d\n", params->b_bframe_adaptive);
lqt_dump(" i_bframe_bias: %d\n", params->i_bframe_bias);
+#if X264_BUILD >= 78
+ lqt_dump(" i_bframe_pyramid: %d\n", params->i_bframe_pyramid);
+#else
lqt_dump(" b_bframe_pyramid: %d\n", params->b_bframe_pyramid);
+#endif
lqt_dump(" b_deblocking_filter: %d\n", params->b_deblocking_filter);
lqt_dump(" i_deblocking_filter_alphac0: %d\n", params->i_deblocking_filter_alphac0); // -6..6
@@ -174,14 +178,21 @@ encode_nals(uint8_t *buf, int size, x264
{
uint8_t *p = buf;
int i;
+#if X264_BUILD < 76
int s;
+#endif
for(i = 0; i < nnal; i++)
{
+#if X264_BUILD >= 76
+ memcpy(p, nals[i].p_payload, nals[i].i_payload);
+ p+=nals[i].i_payload;
+#else
s = x264_nal_encode(p, &size, 1, nals + i);
if(s < 0)
return -1;
p += s;
+#endif
}
return p - buf;
@@ -407,7 +418,11 @@ static int flush_frame(quicktime_t *file
pic_out.i_pts = 0;
/* Encode frames, get nals */
+#if X264_BUILD >= 76
+ if(x264_encoder_encode(codec->enc, &nal, &nnal, pic_in, &pic_out)<0)
+#else
if(x264_encoder_encode(codec->enc, &nal, &nnal, pic_in, &pic_out))
+#endif
return 0;
/* Encode nals -> get h264 stream */
@@ -782,7 +797,11 @@ static int set_parameter(quicktime_t *fi
ENUMPARAM("x264_i_bframe_adaptive", codec->params.i_bframe_adaptive, bframe_adaptives);
#endif
INTPARAM("x264_i_bframe_bias", codec->params.i_bframe_bias);
+#if X264_BUILD >= 78
+ INTPARAM("x264_i_bframe_pyramid", codec->params.i_bframe_pyramid);
+#else
INTPARAM("x264_b_bframe_pyramid", codec->params.b_bframe_pyramid);
+#endif
ENUMPARAM("x264_i_rc_method", codec->params.rc.i_rc_method, rc_methods);
INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate);
@@ -921,3 +940,4 @@ void quicktime_init_codec_x264(quicktime
x264_param_default(&(codec->params));
}
+
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libquicktime.spec 16 Oct 2009 05:55:05 -0000 1.11
+++ libquicktime.spec 27 Oct 2009 21:52:54 -0000 1.12
@@ -1,11 +1,12 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
+Patch0: libquicktime-1.1.3-x264_b78.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel
@@ -54,6 +55,7 @@
%prep
%setup -q
+%patch0 -p1 -b .b78
# --------------------------------------------------------------------
@@ -132,6 +134,9 @@
# --------------------------------------------------------------------
%changelog
+* Tue Oct 27 2009 kwizart <kwizart at gmail.com > - 1.1.3-2
+- backport patch from Alexis Ballier.
+
* Thu Oct 15 2009 kwizart <kwizart at gmail.com > - 1.1.3-1
- Update to 1.1.3
- Conditionalize faac
14 years, 5 months
rpms/ffmpeg/F-10 ffmpeg.spec,1.12,1.13
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22749
Modified Files:
ffmpeg.spec
Log Message:
disable parallel make for debugging
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-10/ffmpeg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ffmpeg.spec 26 Oct 2009 00:39:28 -0000 1.12
+++ ffmpeg.spec 27 Oct 2009 10:07:00 -0000 1.13
@@ -151,7 +151,8 @@
--disable-vis \
%endif
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+make
popd
mkdir simd
@@ -175,7 +176,8 @@
--disable-ffserver \
--disable-ffplay \
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+make
%endif
%ifarch ppc64
%{ff_configure}\
@@ -186,7 +188,8 @@
--disable-ffserver \
--disable-ffplay \
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+make
%endif
%ifarch sparc sparc64
%{ff_configure}\
14 years, 5 months
rpms/x264/devel .cvsignore,1.9,1.10 sources,1.9,1.10
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24524
Modified Files:
.cvsignore sources
Log Message:
upload new sources
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 6 Oct 2009 22:54:11 -0000 1.9
+++ .cvsignore 27 Oct 2009 00:38:53 -0000 1.10
@@ -1 +1 @@
-x264-20091007.tar.bz2
+x264-20091026.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 6 Oct 2009 22:54:11 -0000 1.9
+++ sources 27 Oct 2009 00:38:53 -0000 1.10
@@ -1 +1 @@
-ffc7db63f7a44f083a99ef3a5d8fff72 x264-20091007.tar.bz2
+1a2a758b237859391d802e9b9ffe2ce9 x264-20091026.tar.bz2
14 years, 5 months
rpms/ffmpeg/devel .cvsignore, 1.11, 1.12 ffmpeg.spec, 1.22, 1.23 sources, 1.11, 1.12
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24217
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
upload new sources
drop separate SIMDified libs ppc(64)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 7 Oct 2009 22:37:11 -0000 1.11
+++ .cvsignore 27 Oct 2009 00:38:30 -0000 1.12
@@ -1 +1 @@
-ffmpeg-20091007.tar.bz2
+ffmpeg-20091026.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ffmpeg.spec 26 Oct 2009 14:23:03 -0000 1.22
+++ ffmpeg.spec 27 Oct 2009 00:38:30 -0000 1.23
@@ -135,8 +135,13 @@
%ifarch %{ix86} x86_64
--enable-runtime-cpudetect \
%endif
-%ifarch ppc ppc64
- --disable-altivec \
+%ifarch ppc
+ --cpu=g3 \
+ --enable-runtime-cpudetect \
+%endif
+%ifarch ppc64
+ --cpu=g5 \
+ --enable-runtime-cpudetect \
%endif
%ifarch sparc sparc64
--disable-vis \
@@ -150,28 +155,6 @@
%if 1%{?ffmpegsuffix:0}
mkdir simd
pushd simd
-%ifarch ppc ppc64
-%{ff_configure}\
- --shlibdir=%{_libdir}/altivec \
- --cpu=g4 \
- --enable-altivec \
- --disable-ffmpeg \
- --disable-ffserver \
- --disable-ffplay \
-
-make %{?_smp_mflags}
-%endif
-%ifarch ppc64
-%{ff_configure}\
- --shlibdir=%{_libdir}/altivec \
- --cpu=g5 \
- --enable-altivec \
- --disable-ffmpeg \
- --disable-ffserver \
- --disable-ffplay \
-
-make %{?_smp_mflags}
-%endif
%ifarch sparc sparc64
%{ff_configure}\
--shlibdir=%{_libdir}/v9 \
@@ -193,7 +176,7 @@
popd
%if 1%{?ffmpegsuffix:0}
pushd simd
-%ifarch ppc ppc64 sparc sparc64
+%ifarch sparc sparc64
make install DESTDIR=$RPM_BUILD_ROOT
%endif
popd
@@ -222,9 +205,6 @@
%defattr(-,root,root,-)
%{_libdir}/lib*.so.*
%if 1%{?ffmpegsuffix:0}
-%ifarch ppc ppc64
-%{_libdir}/altivec/lib*.so.*
-%endif
%ifarch sparc sparc64
%{_libdir}/v9/lib*.so.*
%endif
@@ -237,9 +217,6 @@
%{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so
%if 1%{?ffmpegsuffix:0}
-%ifarch ppc ppc64
-%{_libdir}/altivec/lib*.so
-%endif
%ifarch sparc sparc64
%{_libdir}/v9/lib*.so
%endif
@@ -253,7 +230,8 @@
- don't disable yasm for generic builds
- fixed opencore amr support
- dropped workaround for non-standard openjpeg headers location
-- dropped separate SIMDified libs for x86, runtime CPU detection should be enough
+- dropped separate SIMDified libs for x86 and ppc(64),
+ runtime CPU detection should be enough
* Thu Oct 15 2009 kwizart <kwizart at gmail.com > - 0.5-3.svn20091007
- Update to svn snapshot 20091007
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 7 Oct 2009 22:37:11 -0000 1.11
+++ sources 27 Oct 2009 00:38:30 -0000 1.12
@@ -1 +1 @@
-6a8939377b60a1e730dc7cce9af88d82 ffmpeg-20091007.tar.bz2
+d58be64ecdae72a659344133c50b7c1d ffmpeg-20091026.tar.bz2
14 years, 5 months