rpms/nvidia-kmod/F-14 .cvsignore, 1.25, 1.26 nvidia-kmod.spec, 1.76, 1.77 sources, 1.25, 1.26
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27943/F-14
Modified Files:
.cvsignore nvidia-kmod.spec sources
Log Message:
Update to 260.19.36
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-14/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 15 Dec 2010 08:26:32 -0000 1.25
+++ .cvsignore 21 Jan 2011 19:34:45 -0000 1.26
@@ -1 +1 @@
-nvidia-kmod-data-260.19.29.tar.bz2
+nvidia-kmod-data-260.19.36.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-14/nvidia-kmod.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- nvidia-kmod.spec 24 Dec 2010 17:32:51 -0000 1.76
+++ nvidia-kmod.spec 21 Jan 2011 19:34:45 -0000 1.77
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 260.19.29
+Version: 260.19.36
# Taken over by kmodtool
-Release: 1%{?dist}.4
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -86,17 +86,8 @@
%changelog
-* Fri Dec 24 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:260.19.29-1.4
-- rebuild for updated kernel
-
-* Wed Dec 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:260.19.29-1.3
-- rebuild for updated kernel
-
-* Mon Dec 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:260.19.29-1.2
-- rebuild for updated kernel
-
-* Fri Dec 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:260.19.29-1.1
-- rebuild for updated kernel
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.36-1
+- Update to 260.19.36
* Tue Dec 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.29-1
- Update to 260.19.29
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-14/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 15 Dec 2010 08:26:32 -0000 1.25
+++ sources 21 Jan 2011 19:34:45 -0000 1.26
@@ -1 +1 @@
-33c3562db996879b3bc2e5818d679021 nvidia-kmod-data-260.19.29.tar.bz2
+4c24281fd34f00259cc817f952347369 nvidia-kmod-data-260.19.36.tar.bz2
13 years, 10 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.25, 1.26 sources, 1.25, 1.26 xorg-x11-drv-nvidia.spec, 1.53, 1.54
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26984/devel
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 260.19.36
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 14 Dec 2010 22:19:04 -0000 1.25
+++ .cvsignore 21 Jan 2011 19:23:00 -0000 1.26
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-260.19.29.run
-NVIDIA-Linux-x86-260.19.29.run
+NVIDIA-Linux-x86-260.19.36.run
+NVIDIA-Linux-x86_64-260.19.36.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 14 Dec 2010 22:19:04 -0000 1.25
+++ sources 21 Jan 2011 19:23:00 -0000 1.26
@@ -1,2 +1,2 @@
-0539f7af29e19971745811e971b074f8 NVIDIA-Linux-x86_64-260.19.29.run
-e982a05a85c68130acfe1d48086250e3 NVIDIA-Linux-x86-260.19.29.run
+2826484d87827351774449382e45c4a9 NVIDIA-Linux-x86-260.19.36.run
+88376a73c8ba487526a6f62ac82c7c75 NVIDIA-Linux-x86_64-260.19.36.run
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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-drv-nvidia.spec 17 Dec 2010 11:06:19 -0000 1.53
+++ xorg-x11-drv-nvidia.spec 21 Jan 2011 19:23:00 -0000 1.54
@@ -8,8 +8,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 260.19.29
-Release: 2%{?dist}
+Version: 260.19.36
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -233,8 +233,7 @@
rm $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvidia-{cfg,tls}.so
# Remove execstack needs on F-12 and laters
-#if 0%{?fedora} >= 12 || 0%{?rhel} > 5
-%if 0
+%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
find $RPM_BUILD_ROOT%{_libdir} -name '*.so.*' -type f -exec execstack -c {} ';'
%ifarch x86_64
execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-smi
@@ -264,12 +263,6 @@
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
fi
fi || :
-if [ -x /usr/sbin/setsebool ] ; then
- SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
- if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
- /usr/sbin/setsebool -P allow_execstack on &>/dev/null
- fi
-fi ||:
%post libs -p /sbin/ldconfig
@@ -348,6 +341,12 @@
%changelog
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.36-1
+- Update to 260.19.36
+- Restore execstack -c on redistributed binaries
+ instead of forcing selinux bool.
+ (nvidia-installer clears it at runtime when appropriate).
+
* Fri Dec 17 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.29-2
- Fix uninstall on kvarriant - rfbz#1559
13 years, 10 months
rpms/xorg-x11-drv-nvidia/F-14 .cvsignore, 1.26, 1.27 sources, 1.26, 1.27 xorg-x11-drv-nvidia.spec, 1.53, 1.54
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26984/F-14
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 260.19.36
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 15 Dec 2010 08:24:31 -0000 1.26
+++ .cvsignore 21 Jan 2011 19:23:00 -0000 1.27
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-260.19.29.run
-NVIDIA-Linux-x86-260.19.29.run
+NVIDIA-Linux-x86-260.19.36.run
+NVIDIA-Linux-x86_64-260.19.36.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 15 Dec 2010 08:24:31 -0000 1.26
+++ sources 21 Jan 2011 19:23:00 -0000 1.27
@@ -1,2 +1,2 @@
-0539f7af29e19971745811e971b074f8 NVIDIA-Linux-x86_64-260.19.29.run
-e982a05a85c68130acfe1d48086250e3 NVIDIA-Linux-x86-260.19.29.run
+2826484d87827351774449382e45c4a9 NVIDIA-Linux-x86-260.19.36.run
+88376a73c8ba487526a6f62ac82c7c75 NVIDIA-Linux-x86_64-260.19.36.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xorg-x11-drv-nvidia.spec 17 Dec 2010 11:06:19 -0000 1.53
+++ xorg-x11-drv-nvidia.spec 21 Jan 2011 19:23:00 -0000 1.54
@@ -8,8 +8,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 260.19.29
-Release: 2%{?dist}
+Version: 260.19.36
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -233,8 +233,7 @@
rm $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvidia-{cfg,tls}.so
# Remove execstack needs on F-12 and laters
-#if 0%{?fedora} >= 12 || 0%{?rhel} > 5
-%if 0
+%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
find $RPM_BUILD_ROOT%{_libdir} -name '*.so.*' -type f -exec execstack -c {} ';'
%ifarch x86_64
execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-smi
@@ -264,12 +263,6 @@
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
fi
fi || :
-if [ -x /usr/sbin/setsebool ] ; then
- SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
- if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
- /usr/sbin/setsebool -P allow_execstack on &>/dev/null
- fi
-fi ||:
%post libs -p /sbin/ldconfig
@@ -348,6 +341,12 @@
%changelog
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.36-1
+- Update to 260.19.36
+- Restore execstack -c on redistributed binaries
+ instead of forcing selinux bool.
+ (nvidia-installer clears it at runtime when appropriate).
+
* Fri Dec 17 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.29-2
- Fix uninstall on kvarriant - rfbz#1559
13 years, 10 months
rpms/libquicktime/devel libquicktime.spec,1.19,1.20
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24340
Modified Files:
libquicktime.spec
Log Message:
Fix build
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libquicktime.spec 21 Jan 2011 15:07:27 -0000 1.19
+++ libquicktime.spec 21 Jan 2011 18:46:18 -0000 1.20
@@ -110,6 +110,7 @@
%{_bindir}/libquicktime_config
%{_bindir}/lqt_transcode
%{_bindir}/lqtplay
+%{_bindir}/lqtremux
%{_bindir}/qt2text
%{_bindir}/qtdechunk
%{_bindir}/qtdump
@@ -130,6 +131,7 @@
%changelog
* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.2-1
- Update to 1.2.2
+- Add %%{_bindir}/lqtremux
* Sat Jul 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.5-2
- Add libquicktime-1.1.5-gtk.patch from Dan Horák.
13 years, 10 months
rpms/libquicktime/devel .cvsignore, 1.7, 1.8 libquicktime.spec, 1.18, 1.19 sources, 1.7, 1.8 libquicktime-1.1.5-gtk.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9252/devel
Modified Files:
.cvsignore libquicktime.spec sources
Removed Files:
libquicktime-1.1.5-gtk.patch
Log Message:
Update to 1.2.2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 1 May 2010 17:28:37 -0000 1.7
+++ .cvsignore 21 Jan 2011 15:07:27 -0000 1.8
@@ -1 +1 @@
-libquicktime-1.1.5.tar.gz
+libquicktime-1.2.2.tar.gz
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libquicktime.spec 10 Jul 2010 15:18:48 -0000 1.18
+++ libquicktime.spec 21 Jan 2011 15:07:27 -0000 1.19
@@ -1,12 +1,11 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
-Version: 1.1.5
-Release: 2%{?dist}
+Version: 1.2.2
+Release: 1%{?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.5-gtk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel
@@ -57,7 +56,6 @@
%prep
%setup -q
-%patch0 -p1 -b .gtk
# --------------------------------------------------------------------
@@ -123,15 +121,16 @@
%files devel
%defattr(-,root,root,-)
-%exclude %{_bindir}/lqt-config
%{_includedir}/lqt/
%{_libdir}/pkgconfig/libquicktime.pc
%{_libdir}/%{name}*.so
-%{_datadir}/aclocal/lqt.m4
# --------------------------------------------------------------------
%changelog
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.2-1
+- Update to 1.2.2
+
* Sat Jul 10 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.5-2
- Add libquicktime-1.1.5-gtk.patch from Dan Horák.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 1 May 2010 17:28:37 -0000 1.7
+++ sources 21 Jan 2011 15:07:27 -0000 1.8
@@ -1 +1 @@
-0fd45b3deff0317c2f85a34b1b106acf libquicktime-1.1.5.tar.gz
+016a0513a7d3fb1b8e64a265152e559d libquicktime-1.2.2.tar.gz
--- libquicktime-1.1.5-gtk.patch DELETED ---
13 years, 10 months
rpms/mixxx/F-14 mixxx-1.8.2-norpath.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 mixxx.spec, 1.7, 1.8 sources, 1.5, 1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mixxx/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6987/F-14
Modified Files:
.cvsignore mixxx.spec sources
Added Files:
mixxx-1.8.2-norpath.patch
Log Message:
Update to 1.8.2
mixxx-1.8.2-norpath.patch:
SConscript.env | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE mixxx-1.8.2-norpath.patch ---
diff -up mixxx-1.8.2/src/SConscript.env.norpath mixxx-1.8.2/src/SConscript.env
--- mixxx-1.8.2/src/SConscript.env.norpath 2010-12-06 00:07:57.000000000 +0100
+++ mixxx-1.8.2/src/SConscript.env 2011-01-21 15:30:52.455311000 +0100
@@ -837,9 +837,6 @@ if 'win' in platformString:
else:
env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
- if platformString != 'osx':
- env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
- env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
env.Append(CPPDEFINES = "_REENTRANT")
#Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mixxx/F-14/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 13 Oct 2010 15:16:20 -0000 1.5
+++ .cvsignore 21 Jan 2011 14:35:57 -0000 1.6
@@ -1 +1 @@
-mixxx-1.8.0.2-src.tar.gz
+mixxx-1.8.2-src.tar.gz
Index: mixxx.spec
===================================================================
RCS file: /cvs/free/rpms/mixxx/F-14/mixxx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mixxx.spec 13 Oct 2010 15:44:14 -0000 1.7
+++ mixxx.spec 21 Jan 2011 14:35:57 -0000 1.8
@@ -1,5 +1,5 @@
Name: mixxx
-Version: 1.8.0.2
+Version: 1.8.2
Release: 1%{?dist}
Summary: Mixxx is open source software for DJ'ing
@@ -7,6 +7,7 @@
License: GPLv2+
URL: http://www.mixxx.org
Source0: http://downloads.mixxx.org/mixxx-%{version}/mixxx-%{version}-src.tar.gz
+Patch0: mixxx-1.8.2-norpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Build tools
@@ -56,7 +57,7 @@
%prep
%setup -q
-
+%patch0 -p1 -b .norpath
%build
@@ -82,25 +83,10 @@
install_root=$RPM_BUILD_ROOT%{_prefix} \
prefix=%{_prefix} install
-#Recreate desktop file to better handle encoding convertion
-rm $RPM_BUILD_ROOT%{_datadir}/applications/mixxx.desktop
-cat > $RPM_BUILD_ROOT%{_datadir}/applications/mixxx.desktop <<EOF
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Mixxx
-Comment=A digital DJ interface
-Exec=mixxx
-Terminal=false
-Icon=mixxx-icon
-Type=Application
-Categories=AudioVideo;X-Synthesis;
-EOF
-
-desktop-file-install --vendor "" --delete-original \
+desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-category Application \
- $RPM_BUILD_ROOT%{_datadir}/applications/mixxx.desktop
+ --add-category=X-Synthesis \
+ src/mixxx.desktop
#Remove docdir
rm -rf $RPM_BUILD_ROOT%{_docdir}
@@ -120,6 +106,9 @@
%{_datadir}/pixmaps/mixxx-icon.png
%changelog
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.8.2-1
+- Update to 1.8.2
+
* Wed Oct 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.8.0.2-1
- Update to 1.8.0.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mixxx/F-14/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 13 Oct 2010 15:16:20 -0000 1.5
+++ sources 21 Jan 2011 14:35:57 -0000 1.6
@@ -1 +1 @@
-5e896fbd77c1d44f1916e7ad4740c1ac mixxx-1.8.0.2-src.tar.gz
+f0297f4493d4d8e6ad59f72970bad7bc mixxx-1.8.2-src.tar.gz
13 years, 10 months
rpms/mixxx/devel mixxx-1.8.2-norpath.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 mixxx.spec, 1.7, 1.8 sources, 1.5, 1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mixxx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6793/devel
Modified Files:
.cvsignore mixxx.spec sources
Added Files:
mixxx-1.8.2-norpath.patch
Log Message:
Update to 1.8.2
mixxx-1.8.2-norpath.patch:
SConscript.env | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE mixxx-1.8.2-norpath.patch ---
diff -up mixxx-1.8.2/src/SConscript.env.norpath mixxx-1.8.2/src/SConscript.env
--- mixxx-1.8.2/src/SConscript.env.norpath 2010-12-06 00:07:57.000000000 +0100
+++ mixxx-1.8.2/src/SConscript.env 2011-01-21 15:30:52.455311000 +0100
@@ -837,9 +837,6 @@ if 'win' in platformString:
else:
env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
- if platformString != 'osx':
- env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
- env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
env.Append(CPPDEFINES = "_REENTRANT")
#Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 13 Oct 2010 15:16:20 -0000 1.5
+++ .cvsignore 21 Jan 2011 14:35:18 -0000 1.6
@@ -1 +1 @@
-mixxx-1.8.0.2-src.tar.gz
+mixxx-1.8.2-src.tar.gz
Index: mixxx.spec
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/mixxx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mixxx.spec 13 Oct 2010 15:44:14 -0000 1.7
+++ mixxx.spec 21 Jan 2011 14:35:19 -0000 1.8
@@ -1,5 +1,5 @@
Name: mixxx
-Version: 1.8.0.2
+Version: 1.8.2
Release: 1%{?dist}
Summary: Mixxx is open source software for DJ'ing
@@ -7,6 +7,7 @@
License: GPLv2+
URL: http://www.mixxx.org
Source0: http://downloads.mixxx.org/mixxx-%{version}/mixxx-%{version}-src.tar.gz
+Patch0: mixxx-1.8.2-norpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Build tools
@@ -56,7 +57,7 @@
%prep
%setup -q
-
+%patch0 -p1 -b .norpath
%build
@@ -82,25 +83,10 @@
install_root=$RPM_BUILD_ROOT%{_prefix} \
prefix=%{_prefix} install
-#Recreate desktop file to better handle encoding convertion
-rm $RPM_BUILD_ROOT%{_datadir}/applications/mixxx.desktop
-cat > $RPM_BUILD_ROOT%{_datadir}/applications/mixxx.desktop <<EOF
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Mixxx
-Comment=A digital DJ interface
-Exec=mixxx
-Terminal=false
-Icon=mixxx-icon
-Type=Application
-Categories=AudioVideo;X-Synthesis;
-EOF
-
-desktop-file-install --vendor "" --delete-original \
+desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-category Application \
- $RPM_BUILD_ROOT%{_datadir}/applications/mixxx.desktop
+ --add-category=X-Synthesis \
+ src/mixxx.desktop
#Remove docdir
rm -rf $RPM_BUILD_ROOT%{_docdir}
@@ -120,6 +106,9 @@
%{_datadir}/pixmaps/mixxx-icon.png
%changelog
+* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.8.2-1
+- Update to 1.8.2
+
* Wed Oct 13 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.8.0.2-1
- Update to 1.8.0.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mixxx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 13 Oct 2010 15:16:20 -0000 1.5
+++ sources 21 Jan 2011 14:35:19 -0000 1.6
@@ -1 +1 @@
-5e896fbd77c1d44f1916e7ad4740c1ac mixxx-1.8.0.2-src.tar.gz
+f0297f4493d4d8e6ad59f72970bad7bc mixxx-1.8.2-src.tar.gz
13 years, 10 months
rpms/ffmpeg/devel .cvsignore, 1.19, 1.20 ffmpeg-snapshot.sh, 1.8, 1.9 ffmpeg.spec, 1.37, 1.38 sources, 1.19, 1.20
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26725
Modified Files:
.cvsignore ffmpeg-snapshot.sh ffmpeg.spec sources
Log Message:
Restore ffmpeg rebase
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 21 Jan 2011 11:01:32 -0000 1.19
+++ .cvsignore 21 Jan 2011 11:26:03 -0000 1.20
@@ -1 +1 @@
-ffmpeg-20100704.tar.bz2
+ffmpeg-20110110.tar.bz2
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg-snapshot.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ffmpeg-snapshot.sh 21 Jan 2011 11:01:32 -0000 1.8
+++ ffmpeg-snapshot.sh 21 Jan 2011 11:26:03 -0000 1.9
@@ -22,9 +22,6 @@
pushd libswscale
svn update -r $svn libswscale
popd
-./version.sh . version.h
-find . -type d -name .svn -print0 | xargs -0r rm -rf
-sed -i -e '/^\.PHONY: version\.h$/d' Makefile
cd ..
tar jcf "$pwd"/ffmpeg-$date.tar.bz2 ffmpeg-$date
cd - >/dev/null
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ffmpeg.spec 21 Jan 2011 11:02:25 -0000 1.37
+++ ffmpeg.spec 21 Jan 2011 11:26:03 -0000 1.38
@@ -1,15 +1,12 @@
# TODO: add make test to %%check section
-%global svn 20100704
-%{?_with_amr:
-%global _with_opencore_amr 1
-}
+%global svn 20110110
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.6
-Release: 5.%{svn}svn%{?dist}
-%if 0%{?_with_opencore_amr:1}
+Version: 0.6.1
+Release: 1.%{svn}svn%{?dist}
+%if 0%{?_with_amr:1}
License: GPLv3+
%else
License: GPLv2+
@@ -32,11 +29,12 @@
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
BuildRequires: libvpx-devel >= 0.9.1
-%{?_with_opencore_amr:BuildRequires: opencore-amr-devel}
+%{?_with_amr:BuildRequires: opencore-amr-devel}
BuildRequires: openjpeg-devel
BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
BuildRequires: speex-devel
+BuildRequires: subversion
BuildRequires: texi2html
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: xvidcore-devel
@@ -86,7 +84,7 @@
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
--extra-version=rpmfusion \\\
- %{?_with_opencore_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\
+ %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\
--enable-bzlib \\\
--enable-libdc1394 \\\
--enable-libdirac \\\
@@ -104,7 +102,6 @@
--enable-libxvid \\\
--enable-x11grab \\\
--enable-avfilter \\\
- --enable-avfilter-lavf \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
@@ -152,6 +149,7 @@
make %{?_smp_mflags}
make documentation
+make alltools
popd
%if 0%{!?ffmpegsuffix:1}
@@ -175,6 +173,7 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
+install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
popd
%if 0%{!?ffmpegsuffix:1}
pushd simd
@@ -200,6 +199,7 @@
%{_bindir}/ffplay
%{_bindir}/ffprobe
%{_bindir}/ffserver
+%{_bindir}/qt-faststart
%{_mandir}/man1/ffmpeg.1*
%{_mandir}/man1/ffplay.1*
%{_mandir}/man1/ffprobe.1*
@@ -230,6 +230,12 @@
%changelog
+* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.1-1.20110110svn
+- 20110110 snapshot
+- bump version to post-0.6.1 to allow stable 0.6.1 update in older branches
+- drop --with amr->opencore_amr indirection
+- add qt-faststart tool (bug #1259)
+
* Fri Jan 21 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.6-5.20100704svn
- Rebuild for new openjpeg
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 21 Jan 2011 11:01:32 -0000 1.19
+++ sources 21 Jan 2011 11:26:03 -0000 1.20
@@ -1 +1 @@
-9e4119c9252be7e4528c7fb702228701 ffmpeg-20100704.tar.bz2
+fccd69057e331c2541bb024b1e92e864 ffmpeg-20110110.tar.bz2
13 years, 10 months
rpms/ffmpeg/devel ffmpeg.spec,1.36,1.37
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24921
Modified Files:
ffmpeg.spec
Log Message:
* Fri Jan 21 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.6-5.20100704svn
- Rebuild for new openjpeg
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ffmpeg.spec 21 Jan 2011 11:01:32 -0000 1.36
+++ ffmpeg.spec 21 Jan 2011 11:02:25 -0000 1.37
@@ -8,7 +8,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.6
-Release: 4.%{svn}svn%{?dist}
+Release: 5.%{svn}svn%{?dist}
%if 0%{?_with_opencore_amr:1}
License: GPLv3+
%else
@@ -230,6 +230,9 @@
%changelog
+* Fri Jan 21 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.6-5.20100704svn
+- Rebuild for new openjpeg
+
* Wed Jul 21 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6-4.20100704svn
- Enable libva
- Restore compatibility --with amr
13 years, 10 months
rpms/ffmpeg/devel .cvsignore, 1.18, 1.19 ffmpeg-snapshot.sh, 1.7, 1.8 ffmpeg.spec, 1.35, 1.36 sources, 1.18, 1.19
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24865
Modified Files:
.cvsignore ffmpeg-snapshot.sh ffmpeg.spec sources
Log Message:
Revert ffmpeg rebase (prep for rebuild for new openjpeg
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 10 Jan 2011 14:49:29 -0000 1.18
+++ .cvsignore 21 Jan 2011 11:01:32 -0000 1.19
@@ -1 +1 @@
-ffmpeg-20110110.tar.bz2
+ffmpeg-20100704.tar.bz2
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg-snapshot.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ffmpeg-snapshot.sh 10 Jan 2011 14:49:29 -0000 1.7
+++ ffmpeg-snapshot.sh 21 Jan 2011 11:01:32 -0000 1.8
@@ -22,6 +22,9 @@
pushd libswscale
svn update -r $svn libswscale
popd
+./version.sh . version.h
+find . -type d -name .svn -print0 | xargs -0r rm -rf
+sed -i -e '/^\.PHONY: version\.h$/d' Makefile
cd ..
tar jcf "$pwd"/ffmpeg-$date.tar.bz2 ffmpeg-$date
cd - >/dev/null
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ffmpeg.spec 10 Jan 2011 14:49:29 -0000 1.35
+++ ffmpeg.spec 21 Jan 2011 11:01:32 -0000 1.36
@@ -1,12 +1,15 @@
# TODO: add make test to %%check section
-%global svn 20110110
+%global svn 20100704
+%{?_with_amr:
+%global _with_opencore_amr 1
+}
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.6.1
-Release: 1.%{svn}svn%{?dist}
-%if 0%{?_with_amr:1}
+Version: 0.6
+Release: 4.%{svn}svn%{?dist}
+%if 0%{?_with_opencore_amr:1}
License: GPLv3+
%else
License: GPLv2+
@@ -29,12 +32,11 @@
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
BuildRequires: libvpx-devel >= 0.9.1
-%{?_with_amr:BuildRequires: opencore-amr-devel}
+%{?_with_opencore_amr:BuildRequires: opencore-amr-devel}
BuildRequires: openjpeg-devel
BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
BuildRequires: speex-devel
-BuildRequires: subversion
BuildRequires: texi2html
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: xvidcore-devel
@@ -84,7 +86,7 @@
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
--extra-version=rpmfusion \\\
- %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\
+ %{?_with_opencore_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\
--enable-bzlib \\\
--enable-libdc1394 \\\
--enable-libdirac \\\
@@ -102,6 +104,7 @@
--enable-libxvid \\\
--enable-x11grab \\\
--enable-avfilter \\\
+ --enable-avfilter-lavf \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
@@ -149,7 +152,6 @@
make %{?_smp_mflags}
make documentation
-make alltools
popd
%if 0%{!?ffmpegsuffix:1}
@@ -173,7 +175,6 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
-install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
popd
%if 0%{!?ffmpegsuffix:1}
pushd simd
@@ -199,7 +200,6 @@
%{_bindir}/ffplay
%{_bindir}/ffprobe
%{_bindir}/ffserver
-%{_bindir}/qt-faststart
%{_mandir}/man1/ffmpeg.1*
%{_mandir}/man1/ffplay.1*
%{_mandir}/man1/ffprobe.1*
@@ -230,12 +230,6 @@
%changelog
-* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.1-1.20110110svn
-- 20110110 snapshot
-- bump version to post-0.6.1 to allow stable 0.6.1 update in older branches
-- drop --with amr->opencore_amr indirection
-- add qt-faststart tool (bug #1259)
-
* Wed Jul 21 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6-4.20100704svn
- Enable libva
- Restore compatibility --with amr
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 10 Jan 2011 14:49:29 -0000 1.18
+++ sources 21 Jan 2011 11:01:32 -0000 1.19
@@ -1 +1 @@
-fccd69057e331c2541bb024b1e92e864 ffmpeg-20110110.tar.bz2
+9e4119c9252be7e4528c7fb702228701 ffmpeg-20100704.tar.bz2
13 years, 10 months