rpms/thunderbird-enigmail/devel mozilla-670719.patch, NONE, 1.1 xulrunner-2.0-NetworkManager09.patch, NONE, 1.1 xulrunner-2.0-network-link-service.patch, NONE, 1.1 xulrunner-install.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 thunderbird-enigmail.spec, 1.15, 1.16
by Remi Collet
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31403
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
Added Files:
mozilla-670719.patch xulrunner-2.0-NetworkManager09.patch
xulrunner-2.0-network-link-service.patch
xulrunner-install.patch
Log Message:
update to 1.3.3 for thunderbird 8
mozilla-670719.patch:
Makefile.in | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- NEW FILE mozilla-670719.patch ---
# HG changeset patch
# User Mike Hommey <mh+mozilla(a)glandium.org>
# Date 1313846520 -7200
# Node ID fdc3b63938f5a76d99c1e2bb12fd448465debc94
# Parent 07a5a618ebe3f67b23100ceb1b51e92bb79be0cd
Bug 670719 - Only add -DENABLE_JIT=1 to CXXFLAGS if any of trace/method/yarr jit is enabled.
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -433,16 +433,19 @@ CPPSRCS += \
YarrPattern.cpp \
YarrSyntaxChecker.cpp \
$(NULL)
else
###############################################
# BEGIN include sources for the Nitro assembler
#
+
+ENABLE_YARR_JIT = 1
+
VPATH += $(srcdir)/assembler \
$(srcdir)/assembler/wtf \
$(srcdir)/assembler/jit \
$(srcdir)/assembler/assembler \
$(srcdir)/methodjit \
$(srcdir)/yarr \
$(NONE)
@@ -1070,17 +1073,21 @@ endif
###############################################
# BEGIN kludges for the Nitro assembler
#
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
+
+ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
+CXXFLAGS += -DENABLE_JIT=1
+endif
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr
ifdef ENABLE_METHODJIT
# Build a standalone test program that exercises the assembler
# sources a bit.
TESTMAIN_OBJS = \
Assertions.$(OBJ_SUFFIX) \
xulrunner-2.0-NetworkManager09.patch:
nsNetworkManagerListener.cpp | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
--- NEW FILE xulrunner-2.0-NetworkManager09.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=639959
--- source/toolkit/system/dbus/nsNetworkManagerListener.cpp.foo 2011-03-08 14:26:28.167074923 -0600
+++ source/toolkit/system/dbus/nsNetworkManagerListener.cpp 2011-03-08 14:30:54.260748294 -0600
@@ -51,15 +51,13 @@
#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
-#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange"
-typedef enum NMState
-{
- NM_STATE_UNKNOWN = 0,
- NM_STATE_ASLEEP,
- NM_STATE_CONNECTING,
- NM_STATE_CONNECTED,
- NM_STATE_DISCONNECTED
-} NMState;
+#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange" /* Deprecated in 0.7.x */
+#define NM_DBUS_SIGNAL_STATE_CHANGED "StateChanged"
+
+#define NM_STATE_CONNECTED_OLD 3
+#define NM_STATE_CONNECTED_LOCAL 50
+#define NM_STATE_CONNECTED_SITE 60
+#define NM_STATE_CONNECTED_GLOBAL 70
nsNetworkManagerListener::nsNetworkManagerListener() :
mLinkUp(PR_TRUE), mNetworkManagerActive(PR_FALSE),
@@ -174,7 +172,9 @@
PRBool
nsNetworkManagerListener::HandleMessage(DBusMessage* message) {
if (dbus_message_is_signal(message, NM_DBUS_INTERFACE,
- NM_DBUS_SIGNAL_STATE_CHANGE)) {
+ NM_DBUS_SIGNAL_STATE_CHANGE) ||
+ dbus_message_is_signal(message, NM_DBUS_INTERFACE,
+ NM_DBUS_SIGNAL_STATE_CHANGED)) {
UpdateNetworkStatus(message);
return PR_TRUE;
}
@@ -191,7 +191,10 @@
mNetworkManagerActive = PR_TRUE;
PRBool wasUp = mLinkUp;
- mLinkUp = result == NM_STATE_CONNECTED;
+ mLinkUp = (result == NM_STATE_CONNECTED_OLD) ||
+ (result == NM_STATE_CONNECTED_LOCAL) ||
+ (result == NM_STATE_CONNECTED_SITE) ||
+ (result == NM_STATE_CONNECTED_GLOBAL);
if (wasUp == mLinkUp)
return;
xulrunner-2.0-network-link-service.patch:
nsIOService.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++++----------
nsIOService.h | 2 +
2 files changed, 64 insertions(+), 13 deletions(-)
--- NEW FILE xulrunner-2.0-network-link-service.patch ---
# HG changeset patch
# Parent 31879b88cc82c1f44e6a6c25a05aa2c70af22d7e
# User Martin Stransky <stransky(a)redhat.com>
Bug 627672 - XPCOM component (libdbusservice.so) is not registered although it should be; r=cbiesinger
diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -160,31 +160,33 @@ PRInt16 gBadPortList[] = {
2049, // nfs
4045, // lockd
6000, // x11
0, // This MUST be zero so that we can populating the array
};
static const char kProfileChangeNetTeardownTopic[] = "profile-change-net-teardown";
static const char kProfileChangeNetRestoreTopic[] = "profile-change-net-restore";
+static const char kStartupTopic[] = "profile-after-change";
// Necko buffer cache
nsIMemory* nsIOService::gBufferCache = nsnull;
PRUint32 nsIOService::gDefaultSegmentSize = 4096;
PRUint32 nsIOService::gDefaultSegmentCount = 24;
////////////////////////////////////////////////////////////////////////////////
nsIOService::nsIOService()
: mOffline(PR_TRUE)
, mOfflineForProfileChange(PR_FALSE)
, mManageOfflineStatus(PR_TRUE)
, mSettingOffline(PR_FALSE)
, mSetOfflineValue(PR_FALSE)
, mShutdown(PR_FALSE)
+ , mNetworkLinkServiceInitialized(PR_FALSE)
, mChannelEventSinks(NS_CHANNEL_EVENT_SINK_CATEGORY)
, mContentSniffers(NS_CONTENT_SNIFFER_CATEGORY)
, mAutoDialEnabled(PR_FALSE)
{
}
nsresult
nsIOService::Init()
@@ -230,16 +232,17 @@ nsIOService::Init()
}
// Register for profile change notifications
nsCOMPtr<nsIObserverService> observerService =
mozilla::services::GetObserverService();
if (observerService) {
observerService->AddObserver(this, kProfileChangeNetTeardownTopic, PR_TRUE);
observerService->AddObserver(this, kProfileChangeNetRestoreTopic, PR_TRUE);
+ observerService->AddObserver(this, kStartupTopic, PR_TRUE);
observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
observerService->AddObserver(this, NS_NETWORK_LINK_TOPIC, PR_TRUE);
}
else
NS_WARNING("failed to get observer service");
NS_TIME_FUNCTION_MARK("Registered observers");
@@ -258,29 +261,19 @@ nsIOService::Init()
NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Was unable to allocate. No gBufferCache.");
CallQueryInterface(recyclingAllocator, &gBufferCache);
}
NS_TIME_FUNCTION_MARK("Set up the recycling allocator");
gIOService = this;
- // go into managed mode if we can, and chrome process
- if (XRE_GetProcessType() == GeckoProcessType_Default)
- mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID);
-
- if (!mNetworkLinkService)
- // We can't really determine if the machine has a usable network connection,
- // so let's cross our fingers!
- mManageOfflineStatus = PR_FALSE;
-
- if (mManageOfflineStatus)
- TrackNetworkLinkStatusForOffline();
- else
- SetOffline(PR_FALSE);
+ // We can't really determine if the machine has a usable network connection,
+ // (mNetworkLinkService will be initialized later) so let's cross our fingers!
+ SetOffline(PR_FALSE);
NS_TIME_FUNCTION_MARK("Set up network link service");
return NS_OK;
}
nsIOService::~nsIOService()
@@ -306,16 +299,57 @@ nsIOService::InitializeSocketTransportSe
rv = mSocketTransportService->Init();
NS_ASSERTION(NS_SUCCEEDED(rv), "socket transport service init failed");
mSocketTransportService->SetAutodialEnabled(mAutoDialEnabled);
}
return rv;
}
+nsresult
+nsIOService::InitializeNetworkLinkService()
+{
+ NS_TIME_FUNCTION;
+
+ nsresult rv = NS_OK;
+
+ if (mNetworkLinkServiceInitialized)
+ return rv;
+
+#if defined(MOZ_PLATFORM_MAEMO)
+ // libdbusservice fails to initialize on Maemo platform, see Bug 627672
+ mNetworkLinkService = NULL;
+#else
+ // go into managed mode if we can, and chrome process
+ if (XRE_GetProcessType() == GeckoProcessType_Default)
+ {
+ mNetworkLinkService = do_GetService(NS_NETWORK_LINK_SERVICE_CONTRACTID, &rv);
+ if (NS_FAILED(rv)) {
+ NS_WARNING("failed to get network link service");
+ return rv;
+ }
+ }
+#endif
+
+ mNetworkLinkServiceInitialized = PR_TRUE;
+
+ if (!mNetworkLinkService) {
+ // We can't really determine if the machine has a usable network connection,
+ // so let's cross our fingers!
+ mManageOfflineStatus = PR_FALSE;
+ }
+
+ if (mManageOfflineStatus)
+ TrackNetworkLinkStatusForOffline();
+ else
+ SetOffline(PR_FALSE);
+
+ return rv;
+}
+
nsIOService*
nsIOService::GetInstance() {
if (!gIOService) {
gIOService = new nsIOService();
if (!gIOService)
return nsnull;
NS_ADDREF(gIOService);
@@ -689,16 +723,19 @@ nsIOService::NewChannel(const nsACString
if (NS_FAILED(rv)) return rv;
return NewChannelFromURI(uri, result);
}
PRBool
nsIOService::IsLinkUp()
{
+ NS_ASSERTION(mNetworkLinkServiceInitialized,
+ "network link service should be initialized");
+
if (!mNetworkLinkService) {
// We cannot decide, assume the link is up
return PR_TRUE;
}
PRBool isLinkUp;
nsresult rv;
rv = mNetworkLinkService->GetIsLinkUp(&isLinkUp);
@@ -968,16 +1005,20 @@ nsIOService::Observe(nsISupports *subjec
if (mOfflineForProfileChange) {
mOfflineForProfileChange = PR_FALSE;
if (!mManageOfflineStatus ||
NS_FAILED(TrackNetworkLinkStatusForOffline())) {
SetOffline(PR_FALSE);
}
}
}
+ else if (!strcmp(topic, kStartupTopic)) {
+ // Lazy initialization of network link service (see bug 620472)
+ InitializeNetworkLinkService();
+ }
else if (!strcmp(topic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
// Remember we passed XPCOM shutdown notification to prevent any
// changes of the offline status from now. We must not allow going
// online after this point.
mShutdown = PR_TRUE;
SetOffline(PR_TRUE);
@@ -1085,32 +1126,40 @@ nsIOService::NewSimpleNestedURI(nsIURI*
NS_IF_ADDREF(*aResult = new nsSimpleNestedURI(safeURI));
return *aResult ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
NS_IMETHODIMP
nsIOService::SetManageOfflineStatus(PRBool aManage) {
PRBool wasManaged = mManageOfflineStatus;
mManageOfflineStatus = aManage;
+
+ if (!mNetworkLinkServiceInitialized) {
+ InitializeNetworkLinkService();
+ }
+
if (mManageOfflineStatus && !wasManaged)
return TrackNetworkLinkStatusForOffline();
return NS_OK;
}
NS_IMETHODIMP
nsIOService::GetManageOfflineStatus(PRBool* aManage) {
*aManage = mManageOfflineStatus;
return NS_OK;
}
nsresult
nsIOService::TrackNetworkLinkStatusForOffline()
{
NS_ASSERTION(mManageOfflineStatus,
"Don't call this unless we're managing the offline status");
+ NS_ASSERTION(mNetworkLinkServiceInitialized,
+ "network link service should be set up");
+
if (!mNetworkLinkService)
return NS_ERROR_FAILURE;
if (mShutdown)
return NS_ERROR_NOT_AVAILABLE;
// check to make sure this won't collide with Autodial
if (mSocketTransportService) {
diff --git a/netwerk/base/src/nsIOService.h b/netwerk/base/src/nsIOService.h
--- a/netwerk/base/src/nsIOService.h
+++ b/netwerk/base/src/nsIOService.h
@@ -129,16 +129,17 @@ private:
nsIProtocolHandler* hdlr);
// Prefs wrangling
NS_HIDDEN_(void) PrefsChanged(nsIPrefBranch *prefs, const char *pref = nsnull);
NS_HIDDEN_(void) GetPrefBranch(nsIPrefBranch2 **);
NS_HIDDEN_(void) ParsePortList(nsIPrefBranch *prefBranch, const char *pref, PRBool remove);
nsresult InitializeSocketTransportService();
+ nsresult InitializeNetworkLinkService();
private:
PRPackedBool mOffline;
PRPackedBool mOfflineForProfileChange;
PRPackedBool mManageOfflineStatus;
// Used to handle SetOffline() reentrancy. See the comment in
// SetOffline() for more details.
@@ -146,16 +147,17 @@ private:
PRPackedBool mSetOfflineValue;
PRPackedBool mShutdown;
nsCOMPtr<nsPISocketTransportService> mSocketTransportService;
nsCOMPtr<nsPIDNSService> mDNSService;
nsCOMPtr<nsIProtocolProxyService2> mProxyService;
nsCOMPtr<nsINetworkLinkService> mNetworkLinkService;
+ PRPackedBool mNetworkLinkServiceInitialized;
// Cached protocol handlers
nsWeakPtr mWeakHandler[NS_N(gScheme)];
// cached categories
nsCategoryCache<nsIChannelEventSink> mChannelEventSinks;
nsCategoryCache<nsIContentSniffer> mContentSniffers;
xulrunner-install.patch:
packager.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xulrunner-install.patch ---
diff -up comm-release/mozilla/toolkit/mozapps/installer/packager.mk.install comm-release/mozilla/toolkit/mozapps/installer/packager.mk
--- comm-release/mozilla/toolkit/mozapps/installer/packager.mk.install 2011-11-05 10:21:10.000000000 +0100
+++ comm-release/mozilla/toolkit/mozapps/installer/packager.mk 2011-11-08 18:48:08.674042803 +0100
@@ -401,7 +401,7 @@ PRECOMPILE_GRE=$$PWD
endif
GENERATE_CACHE = \
- $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
+ $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \
rm -rf jsloader && \
$(UNZIP) startupCache.zip && \
rm startupCache.zip && \
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 1 Oct 2011 06:16:00 -0000 1.12
+++ .cvsignore 12 Nov 2011 16:23:36 -0000 1.13
@@ -1,2 +1,2 @@
-thunderbird-7.0.source.tar.bz2
-enigmail-1.3.2.tar.gz
+enigmail-1.3.3.tar.gz
+thunderbird-8.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 1 Oct 2011 06:16:00 -0000 1.13
+++ sources 12 Nov 2011 16:23:36 -0000 1.14
@@ -1,2 +1,2 @@
-6a4b2dbdc2324f52c019a3a8dee6dad4 thunderbird-7.0.source.tar.bz2
-2318d60320dc6c3db3c34d968bb7d533 enigmail-1.3.2.tar.gz
+f62cf6b574ed34a550069ab339d15c59 enigmail-1.3.3.tar.gz
+332f60036aebdce7dec6ee2b1af4941d thunderbird-8.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- thunderbird-enigmail.spec 1 Oct 2011 06:36:23 -0000 1.15
+++ thunderbird-enigmail.spec 12 Nov 2011 16:23:36 -0000 1.16
@@ -7,7 +7,7 @@
%define build_langpacks 1
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 7.0
+%global thunver 8.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -25,11 +25,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.3.2
+Version: 1.3.3
%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+
@@ -58,6 +58,12 @@
Patch0: thunderbird-install-dir.patch
Patch7: crashreporter-remove-static.patch
Patch8: xulrunner-6.0-secondary-ipc.patch
+Patch9: mozilla-670719.patch
+Patch10: xulrunner-2.0-network-link-service.patch
+Patch11: xulrunner-2.0-NetworkManager09.patch
+
+# Build patches
+Patch100: xulrunner-install.patch
%if %{official_branding}
@@ -130,6 +136,10 @@
cd mozilla
%patch7 -p2 -b .static
%patch8 -p2 -b .secondary-ipc
+%patch9 -p1 -b .moz670719
+%patch10 -p1 -b .link-service
+%patch11 -p1 -b .NetworkManager09
+%patch100 -p2 -b .install
cd ..
%if %{official_branding}
@@ -198,19 +208,20 @@
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
-%define moz_make_flags -j1
-%ifarch ppc ppc64 s390 s390x
-%define moz_make_flags -j1
-%else
-%define moz_make_flags %{?_smp_mflags}
+MOZ_SMP_FLAGS=-j1
+# On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
+# however builds tend to fail on other arches when building in parallel.
+%ifarch %{ix86} x86_64
+[ -z "$RPM_BUILD_NCPUS" ] && \
+ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
+[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
%endif
-export LDFLAGS="-Wl,-rpath,%{mozappdir}"
-export MAKE="gmake %{moz_make_flags}"
# ===== Thunderbird build =====
# http://enigmail.mozdev.org/download/source.php.html
-make -f client.mk build
+make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
# ===== Enigmail work =====
pushd mailnews/extensions/enigmail
@@ -244,6 +255,9 @@
#===============================================================================
%changelog
+* Sat Nov 12 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.3-1
+- Enigmail 1.3.3 for Thunderbird 8.0
+
* Sat Oct 01 2011 Remi Collet <remi(a)fedoraproject.org> 1.3.2-1.1
- remove unused patch
13 years
rpms/mixxx/F-16 .cvsignore, 1.7, 1.8 mixxx.spec, 1.9, 1.10 sources, 1.7, 1.8
by John Brier
Author: john2583
Update of /cvs/free/rpms/mixxx/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1615
Modified Files:
.cvsignore mixxx.spec sources
Log Message:
* Mon Nov 8 2011 John Brier <johnbrier(a)gmail.com> - 1.9.2-1
- Update to 1.9.2
- build with shoutcast support
- remove -n option to setup since upstream source extracts
into a directory of name-version format now
- remove old experimental build options that are no longer
relevant
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mixxx/F-16/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 9 May 2011 20:13:46 -0000 1.7
+++ .cvsignore 12 Nov 2011 13:19:30 -0000 1.8
@@ -1 +1 @@
-mixxx-1.9.0-src.tar.gz
+mixxx-1.9.2-src.tar.gz
Index: mixxx.spec
===================================================================
RCS file: /cvs/free/rpms/mixxx/F-16/mixxx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mixxx.spec 9 May 2011 20:13:48 -0000 1.9
+++ mixxx.spec 12 Nov 2011 13:19:30 -0000 1.10
@@ -1,6 +1,6 @@
Name: mixxx
-Version: 1.9.0
-Release: 2%{?dist}
+Version: 1.9.2
+Release: 1%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
@@ -52,15 +52,9 @@
can be controlled through the GUI and with external
controllers including MIDI devices, and more.
-Non-default rpmbuild options:
---with bpm: Enable bpm support
---with djconsole: Enable djconsole support
---with libgpod: Enable libgpod support
-
-
%prep
-%setup -q -n mixxx-1.9.0~release-1.9.x~bzr2720
+%setup -q
%patch0 -p1 -b .norpath
@@ -71,11 +65,7 @@
prefix=%{_prefix} \
qtdir=%{_qt4_prefix} \
ladspa=0 \
- shoutcast=0 hifieq=1 script=0 optimize=0 \
- %{?_with_bpm: experimentalbpm=1} \
- %{?_with_djconsole: djconsole=1} \
- %{?_with_libgpod: ipod=1} \
-
+ shoutcast=1 hifieq=1 script=0 optimize=0 \
%install
@@ -110,6 +100,14 @@
%{_datadir}/pixmaps/mixxx-icon.png
%changelog
+* Mon Nov 8 2011 John Brier <johnbrier(a)gmail.com> - 1.9.2-1
+- Update to 1.9.2
+- build with shoutcast support
+- remove -n option to setup since upstream source extracts
+ into a directory of name-version format now
+- remove old experimental build options that are no longer
+ relevant
+
* Mon May 9 2011 John Brier <johnbrier(a)gmail.com> - 1.9.0-2
- add BuildRequires phonon-backend-gstreamer since phonon-backend-vlc
is broken in rpmfusion currently
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mixxx/F-16/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 9 May 2011 20:13:48 -0000 1.7
+++ sources 12 Nov 2011 13:19:30 -0000 1.8
@@ -1 +1 @@
-ea78fc81922e6c7d85d6afffd2e526b1 mixxx-1.9.0-src.tar.gz
+f84095951f66b12af5cf45d19200ff82 mixxx-1.9.2-src.tar.gz
13 years
rpms/kdenlive/devel .cvsignore,1.8,1.9 sources,1.8,1.9
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/kdenlive/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13108
Modified Files:
.cvsignore sources
Log Message:
new-sources
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 11 Nov 2011 18:51:58 -0000 1.8
+++ .cvsignore 11 Nov 2011 18:55:47 -0000 1.9
@@ -0,0 +1 @@
+kdenlive-0.8.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 11 Nov 2011 18:52:00 -0000 1.8
+++ sources 11 Nov 2011 18:55:47 -0000 1.9
@@ -0,0 +1 @@
+0836842f489f6142cee101842ac76c54 kdenlive-0.8.2.tar.gz
13 years
rpms/mlt/devel .cvsignore,1.9,1.10 sources,1.10,1.11
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/mlt/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12460
Modified Files:
.cvsignore sources
Log Message:
new sources
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 11 Nov 2011 18:49:18 -0000 1.9
+++ .cvsignore 11 Nov 2011 18:53:33 -0000 1.10
@@ -0,0 +1 @@
+mlt-0.7.6.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 11 Nov 2011 18:49:18 -0000 1.10
+++ sources 11 Nov 2011 18:53:33 -0000 1.11
@@ -0,0 +1 @@
+105969a63339da2f8ce4ddce1652c9e7 mlt-0.7.6.tar.gz
13 years
rpms/kdenlive/devel .cvsignore, 1.7, 1.8 kdenlive.spec, 1.9, 1.10 sources, 1.7, 1.8 kdenlive-0.7.8-gcc46.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/kdenlive/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12322
Modified Files:
.cvsignore kdenlive.spec sources
Removed Files:
kdenlive-0.7.8-gcc46.patch
Log Message:
* Fri Nov 11 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.2-1
- 0.8.2
- tighten mlt deps
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 22 Jul 2011 09:34:35 -0000 1.7
+++ .cvsignore 11 Nov 2011 18:51:58 -0000 1.8
@@ -1 +0,0 @@
-kdenlive-0.8.tar.gz
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/kdenlive.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdenlive.spec 11 Nov 2011 18:05:46 -0000 1.9
+++ kdenlive.spec 11 Nov 2011 18:52:00 -0000 1.10
@@ -1,5 +1,6 @@
+
Name: kdenlive
-Version: 0.8
+Version: 0.8.2
Release: 1%{?dist}
Summary: Non-linear video editor
License: GPLv2+
@@ -10,11 +11,11 @@
Patch101: kdenlive-0.8-fix-glu.patch
-
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
-BuildRequires: mlt-devel
+BuildRequires: mlt-devel >= 0.7.6
+%global mlt_version %(pkg-config --modversion mlt++ 2>/dev/null || echo 0.7.6)
BuildRequires: qjson-devel
Requires: dvdauthor
@@ -23,8 +24,8 @@
# kdebase-runtime could be reduced to kdelibs4%{?_isa} instead,
# if you don't mind missing many niceties -- Rex
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: mlt%{?_isa} >= %{mlt_version}
Requires: recordmydesktop
-Requires: qjson
%description
Kdenlive is an intuitive and powerful multi-track video editor, including most
@@ -106,6 +107,10 @@
%changelog
+* Fri Nov 11 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.8.2-1
+- 0.8.2
+- tighten mlt deps
+
* Thu Jul 21 2011 Ryan Rix <ry(a)n.rix.si> 0.8-1
- New version
- Add patch to fix FTBFS
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 22 Jul 2011 09:34:35 -0000 1.7
+++ sources 11 Nov 2011 18:52:00 -0000 1.8
@@ -1 +0,0 @@
-26170b4360285e8a7bf53fd122d8854e kdenlive-0.8.tar.gz
--- kdenlive-0.7.8-gcc46.patch DELETED ---
13 years
rpms/mlt/devel .cvsignore, 1.8, 1.9 mlt.spec, 1.14, 1.15 sources, 1.9, 1.10
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/mlt/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11663
Modified Files:
.cvsignore mlt.spec sources
Log Message:
* Fri Nov 11 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.6-1
- 0.7.6
- track files/sonames closer
- tighten subpkg deps via %{?_isa}
- drop dup'd %doc items
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 21 Jul 2011 23:07:40 -0000 1.8
+++ .cvsignore 11 Nov 2011 18:49:18 -0000 1.9
@@ -1 +0,0 @@
-mlt-0.7.4.tar.gz
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/mlt.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mlt.spec 26 Sep 2011 19:57:25 -0000 1.14
+++ mlt.spec 11 Nov 2011 18:49:18 -0000 1.15
@@ -8,8 +8,8 @@
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
-Version: 0.7.4
-Release: 2%{?dist}
+Version: 0.7.6
+Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.mltframework.org/twiki/bin/view/MLT/
@@ -19,7 +19,7 @@
BuildRequires: frei0r-devel
BuildRequires: ffmpeg-devel
-BuildRequires: qt-devel
+BuildRequires: qt4-devel
BuildRequires: libquicktime-devel
BuildRequires: SDL-devel
BuildRequires: gtk2-devel
@@ -52,21 +52,21 @@
License: LGPLv2+
Group: Development/Libraries
Requires: pkgconfig
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%package python
Requires: python
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Summary: Python package to work with MLT
%package ruby
Requires: ruby(abi) = 1.8
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{_isa} = %{version}-%{release}
Summary: Ruby package to work with MLT
%package php
Requires: php
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%[?_isa} = %{version}-%{release}
Summary: PHP package to work with MLT
%description devel
@@ -119,68 +119,76 @@
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
-install -d $RPM_BUILD_ROOT%{python_sitelib}
-install -d $RPM_BUILD_ROOT%{python_sitearch}
-install -d $RPM_BUILD_ROOT%{ruby_sitelib}
-install -d $RPM_BUILD_ROOT%{ruby_sitearch}
-install -d $RPM_BUILD_ROOT%{php_extdir}
-install -pm 0644 src/swig/python/%{name}.py $RPM_BUILD_ROOT%{python_sitelib}/
-install -pm 0755 src/swig/ruby/play.rb $RPM_BUILD_ROOT%{ruby_sitelib}/
-install -pm 0755 src/swig/ruby/thumbs.rb $RPM_BUILD_ROOT%{ruby_sitelib}/
-install -pm 0755 src/swig/ruby/%{name}.so $RPM_BUILD_ROOT%{ruby_sitearch}/
-install -pm 0755 src/swig/python/_%{name}.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -pm 0755 src/swig/php/%{name}.so $RPM_BUILD_ROOT%{php_extdir}/
+
+# manually do what 'make install' skips
+install -D -pm 0644 src/swig/python/mlt.py $RPM_BUILD_ROOT%{python_sitelib}/mlt.py
+install -D -pm 0755 src/swig/ruby/play.rb $RPM_BUILD_ROOT%{ruby_sitelib}/play.rb
+install -D -pm 0755 src/swig/ruby/thumbs.rb $RPM_BUILD_ROOT%{ruby_sitelib}/thumbs.rb
+install -D -pm 0755 src/swig/ruby/mlt.so $RPM_BUILD_ROOT%{ruby_sitearch}/mlt.so
+install -D -pm 0755 src/swig/python/_mlt.so $RPM_BUILD_ROOT%{python_sitearch}/_mlt.so
+install -D -pm 0755 src/swig/php/mlt.so $RPM_BUILD_ROOT%{php_extdir}/mlt.so
mv src/modules/motion_est/README README.motion_est
+
+%check
+# verify pkg-config version sanity
+export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion mlt-framework)" = "%{version}"
+test "$(pkg-config --modversion mlt++)" = "%{version}"
+
+
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
-
-
%postun -p /sbin/ldconfig
-
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING GPL NEWS README*
-%{_bindir}/%{name}-melt
-%{_libdir}/%{name}
-%{_libdir}/*.so.*
-%{_datadir}/%{name}
-
+%{_bindir}/mlt-melt
+%{_libdir}/mlt/
+%{_libdir}/libmlt++.so.%{version}
+%{_libdir}/libmlt++.so.3*
+%{_libdir}/libmlt.so.%{version}
+%{_libdir}/libmlt.so.4*
+%{_datadir}/mlt/
%files python
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING GPL NEWS README*
-%{python_sitelib}/%{name}.py
-%{python_sitelib}/%{name}.pyc
-%{python_sitelib}/%{name}.pyo
-%{python_sitearch}/_%{name}.so
+%{python_sitelib}/mlt.py*
+%{python_sitearch}/_mlt.so
%files ruby
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING GPL NEWS README*
%{ruby_sitelib}/play.rb
%{ruby_sitelib}/thumbs.rb
-%{ruby_sitearch}/%{name}.so
+%{ruby_sitearch}/mlt.so
%files php
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING GPL NEWS README*
-%{php_extdir}/%{name}.so
+%{php_extdir}/mlt.so
%files devel
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING GPL NEWS README* docs/* demo
-%{_libdir}/pkgconfig/*
-%{_libdir}/*.so
-%{_includedir}/*
+%doc docs/* demo/
+%{_libdir}/pkgconfig/mlt-framework.pc
+%{_libdir}/pkgconfig/mlt++.pc
+%{_libdir}/libmlt.so
+%{_libdir}/libmlt++.so
+%{_includedir}/mlt/
+%{_includedir}/mlt++/
%changelog
+* Fri Nov 11 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.6-1
+- 0.7.6
+- track files/sonames closer
+- tighten subpkg deps via %%{?_isa}
+- drop dup'd %%doc items
+
* Mon Sep 26 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.4-2
- Rebuilt for ffmpeg-0.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mlt/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 21 Jul 2011 23:07:40 -0000 1.9
+++ sources 11 Nov 2011 18:49:18 -0000 1.10
@@ -1 +0,0 @@
-d5d1ff686f51131a02b0f6fca0f073da mlt-0.7.4.tar.gz
13 years
rpms/kdenlive/devel kdenlive.spec,1.8,1.9
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/kdenlive/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5994
Modified Files:
kdenlive.spec
Log Message:
testing writability (added whitespace)
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/devel/kdenlive.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdenlive.spec 24 Jul 2011 00:20:22 -0000 1.8
+++ kdenlive.spec 11 Nov 2011 18:05:46 -0000 1.9
@@ -10,6 +10,7 @@
Patch101: kdenlive-0.8-fix-glu.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
13 years
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.69,1.70
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11456
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Resync with devel
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xorg-x11-drv-nvidia.spec 9 Nov 2011 14:25:33 -0000 1.69
+++ xorg-x11-drv-nvidia.spec 10 Nov 2011 20:35:19 -0000 1.70
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 290.06
-Release: 1%{?dist}
+Release: 2%{?dist}.1
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -264,7 +264,7 @@
#/etc/init.d/nvidia start &>/dev/null ||:
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
+ /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' &>/dev/null
fi
fi || :
@@ -285,7 +285,7 @@
KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)*`
for kernel in ${KERNELS} ; do
/sbin/grubby --update-kernel=${kernel} \
- --remove-args='nouveau.modeset=0 rdblacklist=nouveau nomodeset' &>/dev/null
+ --remove-args='nouveau.modeset=0 rdblacklist=nouveau rd.driver.blacklist=nouveau nomodeset' &>/dev/null
done
fi
#Backup and disable previously used xorg.conf
@@ -349,6 +349,9 @@
%changelog
+* Thu Nov 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:290.06-2
+- Switch to rd.driver.blacklist from the deprecated rdblacklist on install
+
* Wed Nov 09 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:290.06-1
- Update to 290.06 beta
13 years
rpms/transcode/F-16 transcode.spec,1.31,1.32
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/transcode/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9608
Modified Files:
transcode.spec
Log Message:
Sync for F-16
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/F-16/transcode.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- transcode.spec 10 Nov 2011 19:14:27 -0000 1.31
+++ transcode.spec 10 Nov 2011 20:27:30 -0000 1.32
@@ -7,7 +7,7 @@
Name: transcode
Version: 1.1.6
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: Video stream processing tool
Group: Applications/Multimedia
13 years
rpms/transcode/F-16 transcode-1.1.6.header.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 transcode.spec, 1.30, 1.31 transcode-1.1.5-fix_v4l.patch, 1.1, NONE transcode-1.1.5-fix_v4l_1.patch, 1.1, NONE transcode-1.1.5-no_video.patch, 1.1, NONE transcode-1.1.5-videodev2.patch, 1.1, NONE transcode-ffmpeg.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/transcode/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30094/F-16
Modified Files:
.cvsignore sources transcode.spec
Added Files:
transcode-1.1.6.header.patch
Removed Files:
transcode-1.1.5-fix_v4l.patch transcode-1.1.5-fix_v4l_1.patch
transcode-1.1.5-no_video.patch transcode-1.1.5-videodev2.patch
transcode-ffmpeg.patch
Log Message:
Update to 1.1.6
Sync with F-16
transcode-1.1.6.header.patch:
probe_v4l.c | 2 +-
v4l/import_v4l.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE transcode-1.1.6.header.patch ---
diff -up transcode-1.1.6/import/probe_v4l.c.header transcode-1.1.6/import/probe_v4l.c
--- transcode-1.1.6/import/probe_v4l.c.header 2011-11-06 09:35:02.000000000 +0100
+++ transcode-1.1.6/import/probe_v4l.c 2011-11-09 22:58:47.082990096 +0100
@@ -31,7 +31,7 @@
#include <sys/ioctl.h>
-#include "v4l/videodev.h"
+#include <libv4l1-videodev.h>
#if defined(HAVE_LINUX_VIDEODEV2_H) && defined(HAVE_STRUCT_V4L2_BUFFER)
#define _LINUX_TIME_H
diff -up transcode-1.1.6/import/v4l/import_v4l.c.header transcode-1.1.6/import/v4l/import_v4l.c
--- transcode-1.1.6/import/v4l/import_v4l.c.header 2011-11-06 09:35:02.000000000 +0100
+++ transcode-1.1.6/import/v4l/import_v4l.c 2011-11-09 22:21:37.225106789 +0100
@@ -29,7 +29,7 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
-#include "videodev.h"
+#include <libv4l1-videodev.h>
#define MOD_NAME "import_v4l.so"
#define MOD_VERSION "v0.2.0 (2008-10-26)"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/transcode/F-16/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 1 Nov 2009 20:19:39 -0000 1.11
+++ .cvsignore 10 Nov 2011 19:14:24 -0000 1.12
@@ -1 +1 @@
-transcode-1.1.5.tar.bz2
+transcode-1.1.6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/transcode/F-16/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 1 Nov 2009 20:19:39 -0000 1.11
+++ sources 10 Nov 2011 19:14:24 -0000 1.12
@@ -1 +1 @@
-41ac6b1c0fe30f3aab286e771fc31b9e transcode-1.1.5.tar.bz2
+d5e062a6f0bdde60285ff1cc5cfeb0f5 transcode-1.1.6.tar.bz2
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/F-16/transcode.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- transcode.spec 27 Sep 2011 20:47:11 -0000 1.30
+++ transcode.spec 10 Nov 2011 19:14:27 -0000 1.31
@@ -6,21 +6,17 @@
%define pvmdir %{_datadir}/pvm3
Name: transcode
-Version: 1.1.5
-Release: 9%{?dist}
+Version: 1.1.6
+Release: 1%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
License: GPLv2+
-URL: http://tcforge.berlios.de/
-Source0: http://prdownload.berlios.de/tcforge/%{name}-%{version}.tar.bz2
+URL: https://bitbucket.org/france/transcode-tcforge/overview
+Source0: https://bitbucket.org/france/transcode-tcforge/downloads/transcode-%{vers...
Patch0: %{name}-pvmbin.patch
Patch3: transcode-1.0.4.external_dv.patch
-Patch4: transcode-1.1.5-fix_v4l.patch
-Patch5: transcode-1.1.5-no_video.patch
-Patch6: transcode-1.1.5-videodev2.patch
-Patch7: transcode-1.1.5-fix_v4l_1.patch
-Patch8: transcode-ffmpeg.patch
+Patch4: transcode-1.1.6.header.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,11 +71,7 @@
%setup -q
%patch0 -p1 -b .pvmbin
%patch3 -p1 -b .external_dv
-%patch4 -p1 -b .fix_v4l
-%patch5 -p1 -b .no_video
-%patch6 -p1 -b .videodev2
-%patch7 -p1 -b .fix_v4l_1
-%patch8 -p1 -b .ff08
+%patch4 -p1 -b .header
rm filter/preview/dv_types.h
rm import/v4l/videodev.h
@@ -157,6 +149,9 @@
%changelog
+* Wed Nov 09 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.6-1
+- Update to 1.1.6
+
* Mon Sep 26 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.5-9
- Rebuilt for FFmpeg-0.8
- Add patch from Rathann
--- transcode-1.1.5-fix_v4l.patch DELETED ---
--- transcode-1.1.5-fix_v4l_1.patch DELETED ---
--- transcode-1.1.5-no_video.patch DELETED ---
--- transcode-1.1.5-videodev2.patch DELETED ---
--- transcode-ffmpeg.patch DELETED ---
13 years