rpms/thunderbird-enigmail/F-15 xulrunner-10.0-gcc47.patch, NONE, 1.1 xulrunner-10.0-secondary-ipc.patch, NONE, 1.1 xulrunner-9.0-secondary-build-fix.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.15, 1.16 thunderbird-enigmail.spec, 1.15, 1.16 mozilla-670719.patch, 1.1, NONE mozilla-696393.patch, 1.1, NONE xulrunner-2.0-NetworkManager09.patch, 1.1, NONE xulrunner-2.0-network-link-service.patch, 1.1, NONE xulrunner-9.0-secondary-ipc.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5696
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Added Files:
xulrunner-10.0-gcc47.patch xulrunner-10.0-secondary-ipc.patch
xulrunner-9.0-secondary-build-fix.patch
Removed Files:
mozilla-670719.patch mozilla-696393.patch
xulrunner-2.0-NetworkManager09.patch
xulrunner-2.0-network-link-service.patch
xulrunner-9.0-secondary-ipc.patch
Log Message:
Enigmail 1.3.5 for Thunderbird 10.0
xulrunner-10.0-gcc47.patch:
ipc/chromium/src/base/time_posix.cc | 2 ++
toolkit/crashreporter/client/Makefile.in | 3 +++
2 files changed, 5 insertions(+)
--- NEW FILE xulrunner-10.0-gcc47.patch ---
diff -up mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 mozilla-beta/ipc/chromium/src/base/time_posix.cc
--- mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 2012-01-24 03:00:00.000000000 -0500
+++ mozilla-beta/ipc/chromium/src/base/time_posix.cc 2012-01-30 14:12:49.198472212 -0500
@@ -14,6 +14,8 @@
#include <time.h>
#endif
+#include <unistd.h>
+
#include <limits>
#include "base/basictypes.h"
diff -up mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-beta/toolkit/crashreporter/client/Makefile.in
--- mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 2012-01-30 14:41:14.475441039 -0500
+++ mozilla-beta/toolkit/crashreporter/client/Makefile.in 2012-01-30 14:43:03.587646656 -0500
@@ -69,6 +69,9 @@ CPPSRCS = \
$(STDCXX_COMPAT) \
$(NULL)
+# Needed for moz_free
+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
+
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += crashreporter_win.cpp
LIBS += \
xulrunner-10.0-secondary-ipc.patch:
base/data_pack.cc | 9 +--------
build/build_config.h | 4 ++--
2 files changed, 3 insertions(+), 10 deletions(-)
--- NEW FILE xulrunner-10.0-secondary-ipc.patch ---
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc
--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2012-01-29 15:44:23.000000000 +0100
+++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc 2012-01-31 10:45:57.784248018 +0100
@@ -91,14 +91,7 @@ bool DataPack::Load(const FilePath& path
bool DataPack::Get(uint32_t resource_id, StringPiece* data) {
// It won't be hard to make this endian-agnostic, but it's not worth
// bothering to do right now.
-#if defined(__BYTE_ORDER)
- // Linux check
- COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN,
- datapack_assumes_little_endian);
-#elif defined(__BIG_ENDIAN__)
- // Mac check
- #error DataPack assumes little endian
-#endif
+#warning DoTheRightThingMakingThisEndianAgnostic!
DataPackEntry* target = reinterpret_cast<DataPackEntry*>(
bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_,
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h
--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc 2012-01-29 15:44:23.000000000 +0100
+++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h 2012-01-31 10:53:24.409935119 +0100
@@ -65,10 +65,10 @@
#elif defined(__ppc__) || defined(__powerpc__)
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && !defined(__arch64)
#define ARCH_CPU_SPARC 1
#define ARCH_CPU_64_BITS 1
-#elif defined(__sparc__)
+#elif defined(__sparc__) && defined(__arch64)
#define ARCH_CPU_SPARC 1
#define ARCH_CPU_32_BITS 1
#elif defined(__mips__)
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h
xulrunner-9.0-secondary-build-fix.patch:
jscompartment.cpp | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE xulrunner-9.0-secondary-build-fix.patch ---
diff -up xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp
--- xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig 2012-01-04 11:06:39.000000000 +0100
+++ xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp 2012-01-04 11:06:43.000000000 +0100
@@ -50,7 +50,6 @@
#include "jswatchpoint.h"
#include "jswrapper.h"
#include "assembler/wtf/Platform.h"
-#include "assembler/jit/ExecutableAllocator.h"
#include "yarr/BumpPointerAllocator.h"
#include "methodjit/MethodJIT.h"
#include "methodjit/PolyIC.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 21 Dec 2011 22:10:00 -0000 1.12
+++ .cvsignore 31 Jan 2012 22:05:50 -0000 1.13
@@ -1,2 +1,2 @@
-enigmail-1.3.4.tar.gz
-thunderbird-9.0.source.tar.bz2
+thunderbird-10.0.source.tar.bz2
+enigmail-1.3.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 21 Dec 2011 22:10:01 -0000 1.15
+++ sources 31 Jan 2012 22:05:50 -0000 1.16
@@ -1,2 +1,2 @@
-2b5f188791811d248b6ff1fc51a5806a enigmail-1.3.4.tar.gz
-681bdf6362945b59b2bec23f8aecc7e7 thunderbird-9.0.source.tar.bz2
+6f76f25894ba746a2e33614d3dd8dbab thunderbird-10.0.source.tar.bz2
+1b008b0d106e238c11e4bead08126bc0 enigmail-1.3.5.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-15/thunderbird-enigmail.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- thunderbird-enigmail.spec 21 Dec 2011 22:10:01 -0000 1.15
+++ thunderbird-enigmail.spec 31 Jan 2012 22:05:50 -0000 1.16
@@ -1,4 +1,4 @@
-%define nspr_version 4.8.8
+%define nspr_version 4.8.9
%define nss_version 3.13.1
%define cairo_version 1.10.0
%define freetype_version 2.1.9
@@ -13,7 +13,8 @@
%define system_sqlite 1
%endif
-%global thunver 9.0
+%global thunver 10.0
+%global thunmax 11.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -31,7 +32,7 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.3.4
+Version: 1.3.5
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
@@ -63,12 +64,12 @@
# Mozilla (XULRunner) patches
Patch0: thunderbird-install-dir.patch
Patch7: crashreporter-remove-static.patch
-Patch8: xulrunner-9.0-secondary-ipc.patch
-Patch10: xulrunner-2.0-network-link-service.patch
-Patch11: xulrunner-2.0-NetworkManager09.patch
-Patch12: mozilla-696393.patch
+Patch8: xulrunner-10.0-secondary-ipc.patch
+# # cherry-picked from 13afcd4c097c
+Patch13: xulrunner-9.0-secondary-build-fix.patch
# Build patches
+Patch100: xulrunner-10.0-gcc47.patch
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
@@ -124,7 +125,9 @@
# because provided by xulrunner).
AutoReq: 0
# All others deps already required by thunderbird
-Requires: gnupg, thunderbird >= %{thunver}
+Requires: gnupg
+Requires: thunderbird >= %{thunver}
+Requires: thunderbird < %{thunmax}
# Nothing usefull provided
AutoProv: 0
@@ -145,10 +148,11 @@
# Mozilla (XULRunner) patches
cd mozilla
%patch7 -p2 -b .static
-%patch8 -p2 -b .secondary-ipc
-%patch10 -p1 -b .link-service
-%patch11 -p1 -b .NetworkManager09
-%patch12 -p2 -b .696393
+%patch8 -p3 -b .secondary-ipc
+%patch13 -p2 -b .secondary-build
+%if 0%{?fedora} >= 17
+%patch100 -p1 -b .gcc47
+%endif
cd ..
%patch200 -p1 -b .addons
@@ -169,6 +173,11 @@
%{__cat} %{SOURCE11} >> .mozconfig
%endif
+# s390(x) fails to start with jemalloc enabled
+%ifarch s390 s390x
+echo "ac_add_options --disable-jemalloc" >> .mozconfig
+%endif
+
%if %{?system_sqlite}
echo "ac_add_options --enable-system-sqlite" >> .mozconfig
%else
@@ -187,7 +196,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
+# sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -270,6 +279,9 @@
#===============================================================================
%changelog
+* Tue Jan 31 2012 Remi Collet <remi(a)fedoraproject.org> 1.3.5-1
+- Enigmail 1.3.5 for Thunderbird 10.0
+
* Wed Dec 21 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.4-1
- Enigmail 1.3.4 for Thunderbird 9.0
--- mozilla-670719.patch DELETED ---
--- mozilla-696393.patch DELETED ---
--- xulrunner-2.0-NetworkManager09.patch DELETED ---
--- xulrunner-2.0-network-link-service.patch DELETED ---
--- xulrunner-9.0-secondary-ipc.patch DELETED ---
12 years, 8 months
rpms/thunderbird-enigmail/F-16 xulrunner-10.0-gcc47.patch, NONE, 1.1 xulrunner-10.0-secondary-ipc.patch, NONE, 1.1 xulrunner-9.0-secondary-build-fix.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 thunderbird-enigmail.spec, 1.19, 1.20 mozilla-670719.patch, 1.1, NONE mozilla-696393.patch, 1.1, NONE xulrunner-2.0-NetworkManager09.patch, 1.1, NONE xulrunner-2.0-network-link-service.patch, 1.1, NONE xulrunner-9.0-secondary-ipc.patch, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22642
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Added Files:
xulrunner-10.0-gcc47.patch xulrunner-10.0-secondary-ipc.patch
xulrunner-9.0-secondary-build-fix.patch
Removed Files:
mozilla-670719.patch mozilla-696393.patch
xulrunner-2.0-NetworkManager09.patch
xulrunner-2.0-network-link-service.patch
xulrunner-9.0-secondary-ipc.patch
Log Message:
Enigmail 1.3.5 for Thunderbird 10.0
xulrunner-10.0-gcc47.patch:
ipc/chromium/src/base/time_posix.cc | 2 ++
toolkit/crashreporter/client/Makefile.in | 3 +++
2 files changed, 5 insertions(+)
--- NEW FILE xulrunner-10.0-gcc47.patch ---
diff -up mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 mozilla-beta/ipc/chromium/src/base/time_posix.cc
--- mozilla-beta/ipc/chromium/src/base/time_posix.cc.gcc47 2012-01-24 03:00:00.000000000 -0500
+++ mozilla-beta/ipc/chromium/src/base/time_posix.cc 2012-01-30 14:12:49.198472212 -0500
@@ -14,6 +14,8 @@
#include <time.h>
#endif
+#include <unistd.h>
+
#include <limits>
#include "base/basictypes.h"
diff -up mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 mozilla-beta/toolkit/crashreporter/client/Makefile.in
--- mozilla-beta/toolkit/crashreporter/client/Makefile.in.gcc47 2012-01-30 14:41:14.475441039 -0500
+++ mozilla-beta/toolkit/crashreporter/client/Makefile.in 2012-01-30 14:43:03.587646656 -0500
@@ -69,6 +69,9 @@ CPPSRCS = \
$(STDCXX_COMPAT) \
$(NULL)
+# Needed for moz_free
+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
+
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += crashreporter_win.cpp
LIBS += \
xulrunner-10.0-secondary-ipc.patch:
base/data_pack.cc | 9 +--------
build/build_config.h | 4 ++--
2 files changed, 3 insertions(+), 10 deletions(-)
--- NEW FILE xulrunner-10.0-secondary-ipc.patch ---
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc
--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2012-01-29 15:44:23.000000000 +0100
+++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/base/data_pack.cc 2012-01-31 10:45:57.784248018 +0100
@@ -91,14 +91,7 @@ bool DataPack::Load(const FilePath& path
bool DataPack::Get(uint32_t resource_id, StringPiece* data) {
// It won't be hard to make this endian-agnostic, but it's not worth
// bothering to do right now.
-#if defined(__BYTE_ORDER)
- // Linux check
- COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN,
- datapack_assumes_little_endian);
-#elif defined(__BIG_ENDIAN__)
- // Mac check
- #error DataPack assumes little endian
-#endif
+#warning DoTheRightThingMakingThisEndianAgnostic!
DataPackEntry* target = reinterpret_cast<DataPackEntry*>(
bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_,
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h
--- thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h.secondary-ipc 2012-01-29 15:44:23.000000000 +0100
+++ thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/build/build_config.h 2012-01-31 10:53:24.409935119 +0100
@@ -65,10 +65,10 @@
#elif defined(__ppc__) || defined(__powerpc__)
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
-#elif defined(__sparc64__)
+#elif defined(__sparc__) && !defined(__arch64)
#define ARCH_CPU_SPARC 1
#define ARCH_CPU_64_BITS 1
-#elif defined(__sparc__)
+#elif defined(__sparc__) && defined(__arch64)
#define ARCH_CPU_SPARC 1
#define ARCH_CPU_32_BITS 1
#elif defined(__mips__)
diff -up thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc thunderbird-10.0/comm-release/mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h
xulrunner-9.0-secondary-build-fix.patch:
jscompartment.cpp | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE xulrunner-9.0-secondary-build-fix.patch ---
diff -up xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp
--- xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig 2012-01-04 11:06:39.000000000 +0100
+++ xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp 2012-01-04 11:06:43.000000000 +0100
@@ -50,7 +50,6 @@
#include "jswatchpoint.h"
#include "jswrapper.h"
#include "assembler/wtf/Platform.h"
-#include "assembler/jit/ExecutableAllocator.h"
#include "yarr/BumpPointerAllocator.h"
#include "methodjit/MethodJIT.h"
#include "methodjit/PolyIC.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 21 Dec 2011 22:07:51 -0000 1.14
+++ .cvsignore 31 Jan 2012 19:41:16 -0000 1.15
@@ -1,2 +1,2 @@
-enigmail-1.3.4.tar.gz
-thunderbird-9.0.source.tar.bz2
+thunderbird-10.0.source.tar.bz2
+enigmail-1.3.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 21 Dec 2011 22:07:51 -0000 1.15
+++ sources 31 Jan 2012 19:41:16 -0000 1.16
@@ -1,2 +1,2 @@
-2b5f188791811d248b6ff1fc51a5806a enigmail-1.3.4.tar.gz
-681bdf6362945b59b2bec23f8aecc7e7 thunderbird-9.0.source.tar.bz2
+6f76f25894ba746a2e33614d3dd8dbab thunderbird-10.0.source.tar.bz2
+1b008b0d106e238c11e4bead08126bc0 enigmail-1.3.5.tar.gz
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-enigmail.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- thunderbird-enigmail.spec 21 Dec 2011 22:09:00 -0000 1.19
+++ thunderbird-enigmail.spec 31 Jan 2012 19:41:16 -0000 1.20
@@ -1,4 +1,4 @@
-%define nspr_version 4.8.8
+%define nspr_version 4.8.9
%define nss_version 3.13.1
%define cairo_version 1.10.0
%define freetype_version 2.1.9
@@ -13,7 +13,8 @@
%define system_sqlite 1
%endif
-%global thunver 9.0
+%global thunver 10.0
+%global thunmax 11.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -31,11 +32,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.3.4
+Version: 1.3.5
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}.1
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -63,12 +64,12 @@
# Mozilla (XULRunner) patches
Patch0: thunderbird-install-dir.patch
Patch7: crashreporter-remove-static.patch
-Patch8: xulrunner-9.0-secondary-ipc.patch
-Patch10: xulrunner-2.0-network-link-service.patch
-Patch11: xulrunner-2.0-NetworkManager09.patch
-Patch12: mozilla-696393.patch
+Patch8: xulrunner-10.0-secondary-ipc.patch
+# # cherry-picked from 13afcd4c097c
+Patch13: xulrunner-9.0-secondary-build-fix.patch
# Build patches
+Patch100: xulrunner-10.0-gcc47.patch
# Linux specific
Patch200: thunderbird-8.0-enable-addons.patch
@@ -124,7 +125,9 @@
# because provided by xulrunner).
AutoReq: 0
# All others deps already required by thunderbird
-Requires: gnupg, thunderbird >= %{thunver}
+Requires: gnupg
+Requires: thunderbird >= %{thunver}
+Requires: thunderbird < %{thunmax}
# Nothing usefull provided
AutoProv: 0
@@ -145,10 +148,11 @@
# Mozilla (XULRunner) patches
cd mozilla
%patch7 -p2 -b .static
-%patch8 -p2 -b .secondary-ipc
-%patch10 -p1 -b .link-service
-%patch11 -p1 -b .NetworkManager09
-%patch12 -p2 -b .696393
+%patch8 -p3 -b .secondary-ipc
+%patch13 -p2 -b .secondary-build
+%if 0%{?fedora} >= 17
+%patch100 -p1 -b .gcc47
+%endif
cd ..
%patch200 -p1 -b .addons
@@ -169,6 +173,11 @@
%{__cat} %{SOURCE11} >> .mozconfig
%endif
+# s390(x) fails to start with jemalloc enabled
+%ifarch s390 s390x
+echo "ac_add_options --disable-jemalloc" >> .mozconfig
+%endif
+
%if %{?system_sqlite}
echo "ac_add_options --enable-system-sqlite" >> .mozconfig
%else
@@ -187,7 +196,7 @@
# All tarballs (as well as CVS) will *always* report as 1.4a1pre (or whatever
# the next major version would be). This is because I create builds from trunk
# and simply label the result as 1.3.x.
-sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
+# sed -i -e '/em:version/s/1.4a1pre/%{version}/' package/install.rdf
grep '<em:version>%{version}</em:version>' package/install.rdf || exit 1
# Apply Enigmail patch here
popd
@@ -270,6 +279,9 @@
#===============================================================================
%changelog
+* Tue Jan 31 2012 Remi Collet <remi(a)fedoraproject.org> 1.3.5-1
+- Enigmail 1.3.5 for Thunderbird 10.0
+
* Wed Dec 21 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.4-1.1
- Enigmail 1.3.4 for Thunderbird 9.0
--- mozilla-670719.patch DELETED ---
--- mozilla-696393.patch DELETED ---
--- xulrunner-2.0-NetworkManager09.patch DELETED ---
--- xulrunner-2.0-network-link-service.patch DELETED ---
--- xulrunner-9.0-secondary-ipc.patch DELETED ---
12 years, 8 months
rpms/gstreamer-ffmpeg/F-16 .cvsignore, 1.11, 1.12 gstreamer-ffmpeg.spec, 1.18, 1.19 sources, 1.11, 1.12
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1863
Modified Files:
.cvsignore gstreamer-ffmpeg.spec sources
Log Message:
* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-1
- New upstream release 0.10.13 (rf#2118, rf#2069)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-16/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 4 Sep 2011 10:04:15 -0000 1.11
+++ .cvsignore 29 Jan 2012 21:17:09 -0000 1.12
@@ -1 +1 @@
-gst-ffmpeg-0.10.12.tar.bz2
+gst-ffmpeg-0.10.13.tar.bz2
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-16/gstreamer-ffmpeg.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gstreamer-ffmpeg.spec 4 Sep 2011 10:04:15 -0000 1.18
+++ gstreamer-ffmpeg.spec 29 Jan 2012 21:17:09 -0000 1.19
@@ -1,5 +1,5 @@
Name: gstreamer-ffmpeg
-Version: 0.10.12
+Version: 0.10.13
Release: 1%{?dist}
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
@@ -10,8 +10,8 @@
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
BuildRequires: gstreamer-devel >= 0.10.0
BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires: ffmpeg-devel >= 0.8
-BuildRequires: liboil-devel bzip2-devel
+BuildRequires: ffmpeg-devel >= 0.8.8
+BuildRequires: orc-devel bzip2-devel
%description
GStreamer is a streaming media framework, based on graphs of filters which
@@ -43,7 +43,6 @@
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/gstreamer-0.10/libgstffmpeg.so
%{_libdir}/gstreamer-0.10/libgstffmpegscale.so
@@ -51,6 +50,9 @@
%changelog
+* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-1
+- New upstream release 0.10.13 (rf#2118, rf#2069)
+
* Sun Sep 4 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.12-1
- New upstream release 0.10.12
- Rebuild for ffmpeg-0.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-16/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Sep 2011 10:04:15 -0000 1.11
+++ sources 29 Jan 2012 21:17:09 -0000 1.12
@@ -1 +1 @@
-8507f33c56e6155a3d450dfe6de835a9 gst-ffmpeg-0.10.12.tar.bz2
+7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2
12 years, 8 months
rpms/gstreamer-ffmpeg/devel .cvsignore, 1.11, 1.12 gstreamer-ffmpeg.spec, 1.18, 1.19 sources, 1.11, 1.12
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1379
Modified Files:
.cvsignore gstreamer-ffmpeg.spec sources
Log Message:
* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-1
- New upstream release 0.10.13 (rf#2118, rf#2069)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 4 Sep 2011 10:04:15 -0000 1.11
+++ .cvsignore 29 Jan 2012 21:15:47 -0000 1.12
@@ -1 +1 @@
-gst-ffmpeg-0.10.12.tar.bz2
+gst-ffmpeg-0.10.13.tar.bz2
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/gstreamer-ffmpeg.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gstreamer-ffmpeg.spec 4 Sep 2011 10:04:15 -0000 1.18
+++ gstreamer-ffmpeg.spec 29 Jan 2012 21:15:47 -0000 1.19
@@ -1,5 +1,5 @@
Name: gstreamer-ffmpeg
-Version: 0.10.12
+Version: 0.10.13
Release: 1%{?dist}
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
@@ -10,8 +10,8 @@
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
BuildRequires: gstreamer-devel >= 0.10.0
BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires: ffmpeg-devel >= 0.8
-BuildRequires: liboil-devel bzip2-devel
+BuildRequires: ffmpeg-devel >= 0.8.8
+BuildRequires: orc-devel bzip2-devel
%description
GStreamer is a streaming media framework, based on graphs of filters which
@@ -43,7 +43,6 @@
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/gstreamer-0.10/libgstffmpeg.so
%{_libdir}/gstreamer-0.10/libgstffmpegscale.so
@@ -51,6 +50,9 @@
%changelog
+* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.13-1
+- New upstream release 0.10.13 (rf#2118, rf#2069)
+
* Sun Sep 4 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.12-1
- New upstream release 0.10.12
- Rebuild for ffmpeg-0.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Sep 2011 10:04:15 -0000 1.11
+++ sources 29 Jan 2012 21:15:47 -0000 1.12
@@ -1 +1 @@
-8507f33c56e6155a3d450dfe6de835a9 gst-ffmpeg-0.10.12.tar.bz2
+7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2
12 years, 8 months
rpms/mpg123/devel .cvsignore, 1.3, 1.4 mpg123.spec, 1.3, 1.4 sources, 1.3, 1.4
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/mpg123/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28314
Modified Files:
.cvsignore mpg123.spec sources
Log Message:
* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.13.4-1
- New upstream release 1.13.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mpg123/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 24 Aug 2010 18:56:10 -0000 1.3
+++ .cvsignore 29 Jan 2012 20:55:13 -0000 1.4
@@ -1 +1 @@
-mpg123-1.12.3.tar.bz2
+mpg123-1.13.4.tar.bz2
Index: mpg123.spec
===================================================================
RCS file: /cvs/free/rpms/mpg123/devel/mpg123.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpg123.spec 25 Jan 2012 14:52:55 -0000 1.3
+++ mpg123.spec 29 Jan 2012 20:55:13 -0000 1.4
@@ -3,14 +3,13 @@
%global apriority 99
Name: mpg123
-Version: 1.12.3
-Release: 2%{?dist}
+Version: 1.13.4
+Release: 1%{?dist}
Summary: MPEG audio player
Group: Applications/Multimedia
License: GPLv2+ and LGPLv2
URL: http://mpg123.org/
Source: http://downloads.sourceforge.net/mpg123/mpg123-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool-ltdl-devel SDL-devel portaudio-devel esound-devel
BuildRequires: jack-audio-connection-kit-devel nas-devel arts-devel
BuildRequires: alsa-lib-devel pulseaudio-libs-devel openal-soft-devel
@@ -84,7 +83,6 @@
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.la
# mpg321 also "provides" a mpg123 manpage an binary so mv ours to mpg123.bin
@@ -99,10 +97,6 @@
ln -s mpg123.bin.1 $RPM_BUILD_ROOT%{_mandir}/man1/mpg123.1
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
%{_sbindir}/alternatives \
--install %{_bindir}/mpg123 mpg321_binlink %{_bindir}/mpg123.bin %{apriority} \
@@ -123,7 +117,6 @@
%files
-%defattr(-,root,root,-)
%{_bindir}/mpg123.bin
%ghost %{_bindir}/mpg123
%ghost %{_bindir}/mp3-cmdline
@@ -135,15 +128,12 @@
%ghost %{_mandir}/man1/mpg123.1%{man_ext}
%files plugins-pulseaudio
-%defattr(-,root,root,-)
%{_libdir}/mpg123/output_pulse.*
%files plugins-jack
-%defattr(-,root,root,-)
%{_libdir}/mpg123/output_jack.*
%files plugins-extras
-%defattr(-,root,root,-)
%{_libdir}/mpg123/output_arts.*
%{_libdir}/mpg123/output_esd.*
%{_libdir}/mpg123/output_nas.*
@@ -152,12 +142,10 @@
%{_libdir}/mpg123/output_sdl.*
%files -n libmpg123
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/libmpg123.so.*
%files -n libmpg123-devel
-%defattr(-,root,root,-)
%doc doc/*
%{_includedir}/mpg123.h
%{_libdir}/libmpg123.so
@@ -165,6 +153,9 @@
%changelog
+* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.13.4-1
+- New upstream release 1.13.4
+
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.12.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mpg123/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 24 Aug 2010 18:56:10 -0000 1.3
+++ sources 29 Jan 2012 20:55:13 -0000 1.4
@@ -1 +1 @@
-c1568be2d1715786bd6b1a89ec6fa7ef mpg123-1.12.3.tar.bz2
+073620b3938c4cb9c4f70e8fe3e114b8 mpg123-1.13.4.tar.bz2
12 years, 8 months
rpms/audacious-plugins-freeworld/devel audacious-plugins-3.2-mp3-err-handling-fix.patch, NONE, 1.1 audacious-plugins-freeworld.spec, 1.22, 1.23
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28187
Modified Files:
audacious-plugins-freeworld.spec
Added Files:
audacious-plugins-3.2-mp3-err-handling-fix.patch
Log Message:
* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> 3.2-2
- Silence false error printf's when reaching EOF on mp3 files
audacious-plugins-3.2-mp3-err-handling-fix.patch:
mpg123.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE audacious-plugins-3.2-mp3-err-handling-fix.patch ---
diff -up audacious-plugins-3.2/src/mpg123/mpg123.c~ audacious-plugins-3.2/src/mpg123/mpg123.c
--- audacious-plugins-3.2/src/mpg123/mpg123.c~ 2012-01-20 20:48:30.000000000 +0100
+++ audacious-plugins-3.2/src/mpg123/mpg123.c 2012-01-29 21:49:43.991545176 +0100
@@ -432,7 +432,9 @@ GET_FORMAT:
if (! outbuf_size && (ret = mpg123_read (ctx.decoder, (void *) outbuf,
sizeof outbuf, & outbuf_size)) < 0)
{
- if (ret == MPG123_DONE || ret == MPG123_ERR_READER)
+ if (ret == MPG123_NEED_MORE)
+ continue;
+ if (ret == MPG123_DONE)
goto decode_cleanup;
fprintf (stderr, "mpg123 error in %s: %s\n", filename,
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- audacious-plugins-freeworld.spec 29 Jan 2012 20:07:10 -0000 1.22
+++ audacious-plugins-freeworld.spec 29 Jan 2012 20:55:09 -0000 1.23
@@ -5,7 +5,7 @@
Name: audacious-plugins-freeworld
Version: 3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
@@ -19,6 +19,8 @@
# Revert 166902832b0e94d090acaf1c31688e70668388ac
# (this can be dropped once we have ffmpeg-0.9.x in rpmfusion)
Patch0: audacious-plugins-3.2-ffmpeg-0.8.8.patch
+# emailed to upstream
+Patch1: audacious-plugins-3.2-mp3-err-handling-fix.patch
BuildRequires: audacious-devel >= %{version}
BuildRequires: zlib-devel, libxml2-devel, desktop-file-utils >= 0.9
@@ -108,6 +110,7 @@
%prep
%setup -q -n audacious-plugins-%{version}
%patch0 -p1
+%patch1 -p1
sed -i '\,^.SILENT:,d' buildsys.mk.in
@@ -187,6 +190,9 @@
%changelog
+* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> 3.2-2
+- Silence false error printf's when reaching EOF on mp3 files
+
* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> 3.2-1
- Upgrade to 3.2
12 years, 8 months
rpms/audacious-plugins-freeworld/devel audacious-plugins-3.2-ffmpeg-0.8.8.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 audacious-plugins-freeworld.spec, 1.21, 1.22 sources, 1.12, 1.13
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21821
Modified Files:
.cvsignore audacious-plugins-freeworld.spec sources
Added Files:
audacious-plugins-3.2-ffmpeg-0.8.8.patch
Log Message:
* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> 3.2-1
- Upgrade to 3.2
audacious-plugins-3.2-ffmpeg-0.8.8.patch:
configure | 16 +++---
src/ffaudio/ffaudio-core.c | 105 +++++++++++++++++++++++++++++++++++++++------
2 files changed, 100 insertions(+), 21 deletions(-)
--- NEW FILE audacious-plugins-3.2-ffmpeg-0.8.8.patch ---
diff -up audacious-plugins-3.2/configure.orig audacious-plugins-3.2/configure
--- audacious-plugins-3.2/configure.orig 2012-01-29 20:59:35.962585477 +0100
+++ audacious-plugins-3.2/configure 2012-01-29 20:46:55.212595670 +0100
@@ -10914,12 +10914,12 @@ if test -n "$FFMPEG_CFLAGS"; then
pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.8.0 libavformat >= 53.5.0 libavutil >= 50.42.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.8.0 libavformat >= 53.5.0 libavutil >= 50.42.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>/dev/null`
+ pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 53.8.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -10931,12 +10931,12 @@ if test -n "$FFMPEG_LIBS"; then
pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.8.0 libavformat >= 53.5.0 libavutil >= 50.42.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.8.0 libavformat >= 53.5.0 libavutil >= 50.42.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>/dev/null`
+ pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 53.8.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -10957,9 +10957,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>&1`
+ FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 53.8.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>&1`
else
- FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>&1`
+ FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 53.8.0 libavformat >= 53.5.0 libavutil >= 50.42.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FFMPEG_PKG_ERRORS" >&5
diff -up audacious-plugins-3.2/src/ffaudio/ffaudio-core.c.orig audacious-plugins-3.2/src/ffaudio/ffaudio-core.c
--- audacious-plugins-3.2/src/ffaudio/ffaudio-core.c.orig 2012-01-20 20:48:30.000000000 +0100
+++ audacious-plugins-3.2/src/ffaudio/ffaudio-core.c 2012-01-29 20:56:28.256588042 +0100
@@ -40,6 +40,14 @@
#endif
#include <libaudcore/audstrings.h>
+#if ! CHECK_LIBAVFORMAT_VERSION (53, 5, 0)
+#define avformat_find_stream_info(i, o) av_find_stream_info (i)
+#endif
+
+#if ! CHECK_LIBAVCODEC_VERSION (53, 8, 0)
+#define avcodec_open2(a, c, o) avcodec_open (a, c)
+#endif
+
static GMutex *ctrl_mutex = NULL;
static GCond *ctrl_cond = NULL;
static gint64 seek_value = -1;
@@ -423,8 +431,11 @@ static gboolean ffaudio_play (InputPlayb
AVCodecContext *c = NULL;
AVStream *s = NULL;
AVPacket pkt = {.data = NULL};
+ guint8 *outbuf = NULL, *resbuf = NULL;
gint i, stream_id, errcount;
- gboolean codec_opened = FALSE;
+ gint in_sample_size, out_sample_size, chunk_size;
+ ReSampleContext *resctx = NULL;
+ gboolean codec_opened = FALSE, do_resampling = FALSE;
gint out_fmt;
gboolean seekable;
gboolean error = FALSE;
@@ -460,14 +471,37 @@ static gboolean ffaudio_play (InputPlayb
codec_opened = TRUE;
+ /* Determine if audio conversion or resampling is needed */
+ in_sample_size = av_get_bytes_per_sample (c->sample_fmt);
+ out_sample_size = av_get_bytes_per_sample (SAMPLE_FMT_S16);
+
+ chunk_size = out_sample_size * c->channels * (c->sample_rate / 50);
+
switch (c->sample_fmt) {
case SAMPLE_FMT_U8: out_fmt = FMT_U8; break;
case SAMPLE_FMT_S16: out_fmt = FMT_S16_NE; break;
case SAMPLE_FMT_S32: out_fmt = FMT_S32_NE; break;
case SAMPLE_FMT_FLT: out_fmt = FMT_FLOAT; break;
- default:
- fprintf (stderr, "ffaudio: Unsupported audio format %d\n", (int) c->sample_fmt);
- goto error_exit;
+ default: do_resampling = TRUE; break;
+ }
+
+ if (do_resampling)
+ {
+ /* Initialize resampling context */
+ out_fmt = FMT_S16_NE;
+
+ AUDDBG("resampling needed chn=%d, rate=%d, fmt=%d -> chn=%d, rate=%d, fmt=S16NE\n",
+ c->channels, c->sample_rate, c->sample_fmt,
+ c->channels, c->sample_rate);
+
+ resctx = av_audio_resample_init(
+ c->channels, c->channels,
+ c->sample_rate, c->sample_rate,
+ SAMPLE_FMT_S16, c->sample_fmt,
+ 16, 10, 0, 0.8);
+
+ if (resctx == NULL)
+ goto error_exit;
}
/* Open audio output */
@@ -481,6 +515,10 @@ static gboolean ffaudio_play (InputPlayb
playback->set_gain_from_playlist(playback);
+ /* Allocate output buffer aligned to 16 byte boundary */
+ outbuf = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
+ resbuf = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
+
AUDDBG("setting parameters\n");
if (pause)
@@ -553,6 +591,9 @@ static gboolean ffaudio_play (InputPlayb
memcpy(&tmp, &pkt, sizeof(tmp));
while (tmp.size > 0 && !stop_flag)
{
+ gint len, out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+ guint8 *outbuf_p;
+
/* Check for seek request and bail out if we have one */
g_mutex_lock(ctrl_mutex);
if (seek_value != -1)
@@ -570,25 +611,59 @@ static gboolean ffaudio_play (InputPlayb
}
g_mutex_unlock(ctrl_mutex);
- AVFrame * frame = avcodec_alloc_frame ();
- int decoded = 0;
- int len = avcodec_decode_audio4 (c, frame, & decoded, & tmp);
-
+ /* Decode whatever we can of the frame data */
+ len = avcodec_decode_audio3(c, (gint16 *)outbuf, &out_size, &tmp);
if (len < 0)
{
- fprintf (stderr, "ffaudio: decode_audio() failed, code %d\n", len);
+ AUDDBG("codec failure, breaking out of loop\n");
break;
}
tmp.size -= len;
tmp.data += len;
- if (! decoded)
+ if (out_size <= 0)
continue;
- playback->output->write_audio (frame->data[0], FMT_SIZEOF (out_fmt)
- * c->channels * frame->nb_samples);
- av_free (frame);
+ /* Perform audio resampling if necessary */
+ if (do_resampling)
+ {
+ out_size = audio_resample(resctx,
+ (gint16 *)resbuf, (gint16 *)outbuf,
+ out_size / in_sample_size) * out_sample_size;
+ outbuf_p = resbuf;
+ }
+ else
+ outbuf_p = outbuf;
+
+ /* Output audio in small blocks */
+ while (out_size > 0 && !stop_flag && (stop_time < 0 ||
+ playback->output->written_time () < stop_time))
+ {
+ gint writeoff = MIN (chunk_size, out_size);
+
+ playback->output->write_audio((gint16 *)outbuf_p, writeoff);
+
+ outbuf_p += writeoff;
+ out_size -= writeoff;
+
+ /* Check for seek request and bail out if we have one */
+ g_mutex_lock(ctrl_mutex);
+ if (seek_value != -1)
+ {
+ if (!seekable)
+ {
+ seek_value = -1;
+ g_cond_signal(ctrl_cond);
+ }
+ else
+ {
+ g_mutex_unlock(ctrl_mutex);
+ break;
+ }
+ }
+ g_mutex_unlock(ctrl_mutex);
+ }
}
if (pkt.data)
@@ -611,6 +686,10 @@ error_exit:
stop_flag = TRUE;
+ av_free(outbuf);
+ av_free(resbuf);
+ if (resctx != NULL)
+ audio_resample_close(resctx);
if (pkt.data)
av_free_packet(&pkt);
if (codec_opened)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 3 Nov 2011 11:24:10 -0000 1.12
+++ .cvsignore 29 Jan 2012 20:07:10 -0000 1.13
@@ -1 +1 @@
-audacious-plugins-3.0.4.tar.gz
+audacious-plugins-3.2.tar.bz2
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- audacious-plugins-freeworld.spec 18 Nov 2011 16:01:01 -0000 1.21
+++ audacious-plugins-freeworld.spec 29 Jan 2012 20:07:10 -0000 1.22
@@ -4,18 +4,22 @@
%endif
Name: audacious-plugins-freeworld
-Version: 3.0.4
+Version: 3.2
Release: 1%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
License: GPLv3
URL: http://audacious-media-player.org/
-Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tar.gz
+Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{version}....
Source1: audacious-mp3.desktop
Source2: audacious-aac.desktop
Source3: audacious-ffaudio.desktop
+# Revert 166902832b0e94d090acaf1c31688e70668388ac
+# (this can be dropped once we have ffmpeg-0.9.x in rpmfusion)
+Patch0: audacious-plugins-3.2-ffmpeg-0.8.8.patch
+
BuildRequires: audacious-devel >= %{version}
BuildRequires: zlib-devel, libxml2-devel, desktop-file-utils >= 0.9
BuildRequires: taglib-devel >= 1.4
@@ -103,6 +107,7 @@
%prep
%setup -q -n audacious-plugins-%{version}
+%patch0 -p1
sed -i '\,^.SILENT:,d' buildsys.mk.in
@@ -182,6 +187,9 @@
%changelog
+* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> 3.2-1
+- Upgrade to 3.2
+
* Thu Nov 3 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> 3.0.4-1
- Upgrade to 3.0.4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 3 Nov 2011 11:24:10 -0000 1.12
+++ sources 29 Jan 2012 20:07:10 -0000 1.13
@@ -1 +1 @@
-f269ae195a7077ccefb28a44634c0785 audacious-plugins-3.0.4.tar.gz
+2df0b105bf0662f116de2ecbe0c0a107 audacious-plugins-3.2.tar.bz2
12 years, 8 months
rpms/xbmc/devel .cvsignore, 1.11, 1.12 sources, 1.13, 1.14 xbmc-generate-tarball-xz.sh, 1.11, 1.12 xbmc.spec, 1.38, 1.39
by Alex Lancaster
Author: alexlan
Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3540
Modified Files:
.cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec
Log Message:
Update to Eden beta2.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 28 Dec 2011 21:08:39 -0000 1.11
+++ .cvsignore 29 Jan 2012 18:00:10 -0000 1.12
@@ -1 +1 @@
-xbmc-11.0-Eden_beta1-patched.tar.xz
+xbmc-11.0-Eden_beta2-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 28 Dec 2011 22:14:14 -0000 1.13
+++ sources 29 Jan 2012 18:00:10 -0000 1.14
@@ -1 +1 @@
-70495b10a8fa28892652f7c1096f549e xbmc-11.0-Eden_beta1-patched.tar.xz
+1a545ba86f502407d2057773183a5998 xbmc-11.0-Eden_beta2-patched.tar.xz
Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xbmc-generate-tarball-xz.sh 28 Dec 2011 21:49:06 -0000 1.11
+++ xbmc-generate-tarball-xz.sh 29 Jan 2012 18:00:10 -0000 1.12
@@ -2,11 +2,12 @@
MAJORVERSION=11
MINORVERSION=0
-PRERELEASE=Eden_beta1
+PRERELEASE=Eden_beta2
VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
-GITHUBURL=https://github.com/xbmc/xbmc/tarball/$VERSION-Dharma
+# GITHUBURL below is obsolete, I think
+#GITHUBURL=https://github.com/xbmc/xbmc/tarball/$VERSION-Eden
# comment-out line below if using tarball
#curl -L $GITHUBURL | tar xz
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xbmc.spec 30 Dec 2011 19:17:24 -0000 1.38
+++ xbmc.spec 29 Jan 2012 18:00:10 -0000 1.39
@@ -1,11 +1,11 @@
-%global PRERELEASE Eden_beta1
+%global PRERELEASE Eden_beta2
#global DIRVERSION %{version}
# use below for pre-release
%global DIRVERSION %{version}-%{PRERELEASE}
Name: xbmc
Version: 11.0
-Release: 0.5.%{PRERELEASE}%{?dist}
+Release: 0.6.%{PRERELEASE}%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -271,6 +271,9 @@
%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Sun Jan 29 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.6.Eden_beta2
+- Update to Eden beta2
+
* Fri Dec 30 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.5.Eden_beta1
- Add additional patch from http://trac.xbmc.org/ticket/12001 to
fix uninitialised pointer with libpng 1.5
12 years, 8 months
rpms/minidlna/F-16 .cvsignore, 1.2, 1.3 minidlna.spec, 1.1, 1.2 sources, 1.2, 1.3
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8623
Modified Files:
.cvsignore minidlna.spec sources
Log Message:
* Sat Jan 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.23-1
- Updated to upstream 1.0.23
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-16/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Jan 2012 13:25:52 -0000 1.2
+++ .cvsignore 28 Jan 2012 19:59:31 -0000 1.3
@@ -1,2 +1,2 @@
+minidlna_1.0.23_src.tar.gz
minidlna-1.0.21-debian-manpages.tar.gz
-minidlna_1.0.22_src.tar.gz
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-16/minidlna.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- minidlna.spec 22 Jan 2012 13:25:52 -0000 1.1
+++ minidlna.spec 28 Jan 2012 19:59:31 -0000 1.2
@@ -1,6 +1,6 @@
Name: minidlna
-Version: 1.0.22
-Release: 2%{?dist}
+Version: 1.0.23
+Release: 1%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
@@ -63,6 +63,7 @@
%install
make install DESTDIR=%{buildroot}
+make install-conf DESTDIR=%{buildroot}
# Install systemd unit file
mkdir -p %{buildroot}%{_unitdir}
@@ -127,6 +128,9 @@
%changelog
+* Sat Jan 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.23-1
+- Updated to upstream 1.0.23
+
* Sun Jan 22 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.22-2
- Fixed systemd unit file
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-16/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Jan 2012 13:25:52 -0000 1.2
+++ sources 28 Jan 2012 19:59:31 -0000 1.3
@@ -1,2 +1,2 @@
+409a36830a9ac2aaddfaff4c8b90a40f minidlna_1.0.23_src.tar.gz
34a13ba9d1edf066c1884947633dfa33 minidlna-1.0.21-debian-manpages.tar.gz
-3de2f6b54f43bb998dfad3c8fa75cef3 minidlna_1.0.22_src.tar.gz
12 years, 8 months
rpms/minidlna/devel .cvsignore, 1.2, 1.3 minidlna.spec, 1.1, 1.2 sources, 1.2, 1.3
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8494
Modified Files:
.cvsignore minidlna.spec sources
Log Message:
* Sat Jan 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.23-1
- Updated to upstream 1.0.23
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Jan 2012 13:21:32 -0000 1.2
+++ .cvsignore 28 Jan 2012 19:59:08 -0000 1.3
@@ -1,2 +1,2 @@
+minidlna_1.0.23_src.tar.gz
minidlna-1.0.21-debian-manpages.tar.gz
-minidlna_1.0.22_src.tar.gz
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/minidlna.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- minidlna.spec 22 Jan 2012 13:21:32 -0000 1.1
+++ minidlna.spec 28 Jan 2012 19:59:08 -0000 1.2
@@ -1,6 +1,6 @@
Name: minidlna
-Version: 1.0.22
-Release: 2%{?dist}
+Version: 1.0.23
+Release: 1%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
@@ -63,6 +63,7 @@
%install
make install DESTDIR=%{buildroot}
+make install-conf DESTDIR=%{buildroot}
# Install systemd unit file
mkdir -p %{buildroot}%{_unitdir}
@@ -127,6 +128,9 @@
%changelog
+* Sat Jan 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.23-1
+- Updated to upstream 1.0.23
+
* Sun Jan 22 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.22-2
- Fixed systemd unit file
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Jan 2012 13:21:32 -0000 1.2
+++ sources 28 Jan 2012 19:59:08 -0000 1.3
@@ -1,2 +1,2 @@
+409a36830a9ac2aaddfaff4c8b90a40f minidlna_1.0.23_src.tar.gz
34a13ba9d1edf066c1884947633dfa33 minidlna-1.0.21-debian-manpages.tar.gz
-3de2f6b54f43bb998dfad3c8fa75cef3 minidlna_1.0.22_src.tar.gz
12 years, 8 months