rpms/xorg-x11-drv-psb/devel xorg-x11-drv-psb-0.32.0-mixed.patch, NONE, 1.1
by Adam Williamson
Author: adamwill
Update of /cvs/nonfree/rpms/xorg-x11-drv-psb/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4581
Added Files:
xorg-x11-drv-psb-0.32.0-mixed.patch
Log Message:
add a missing patch file
xorg-x11-drv-psb-0.32.0-mixed.patch:
psb_accel.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
--- NEW FILE xorg-x11-drv-psb-0.32.0-mixed.patch ---
--- xserver-xorg-video-psb-0.32.1/src/psb_accel.c.orig 2010-07-04 19:27:48.691227698 +0200
+++ xserver-xorg-video-psb-0.32.1/src/psb_accel.c 2010-07-04 19:27:15.338230809 +0200
@@ -308,6 +308,14 @@
}
#endif
+static void*
+psbExaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, int usage_hint, int bpp, int* new_pitch )
+{
+ return NULL;
+}
+static void
+psbExaDestroyPixmap(ScreenPtr pScreen, void* driverPriv ){
+}
static Bool
psbExaPixmapIsOffscreen(PixmapPtr p)
{
@@ -1313,6 +1321,7 @@
pExa->pixmapOffsetAlign = 8;
pExa->pixmapPitchAlign = 32 * 4;
pExa->flags = EXA_OFFSCREEN_PIXMAPS;
+ pExa->flags |= EXA_HANDLES_PIXMAPS | EXA_MIXED_PIXMAPS;
pExa->maxX = 2047;
pExa->maxY = 2047;
pExa->WaitMarker = psbExaWaitMarker;
@@ -1328,6 +1337,9 @@
pExa->Composite = psbExaSuperComposite;
pExa->DoneComposite = psbExaDoneComposite;
pExa->PixmapIsOffscreen = psbExaPixmapIsOffscreen;
+ pExa->CreatePixmap = NULL;
+ pExa->CreatePixmap2 = psbExaCreatePixmap;
+ pExa->DestroyPixmap = psbExaDestroyPixmap;
pExa->PrepareAccess = psbExaPrepareAccess;
pExa->FinishAccess = psbExaFinishAccess;
pExa->UploadToScreen = psbExaUploadToScreen;
14 years, 2 months
rpms/xorg-x11-drv-psb/devel xorg-x11-drv-psb-0.32.0-rotate.patch, NONE, 1.1 xorg-x11-drv-psb.spec, 1.1, 1.2
by Adam Williamson
Author: adamwill
Update of /cvs/nonfree/rpms/xorg-x11-drv-psb/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4501
Modified Files:
xorg-x11-drv-psb.spec
Added Files:
xorg-x11-drv-psb-0.32.0-rotate.patch
Log Message:
* Thu Jul 22 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-4
- add rotate.patch, from Yves: fixes 90 degree rotation
xorg-x11-drv-psb-0.32.0-rotate.patch:
psb_crtc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE xorg-x11-drv-psb-0.32.0-rotate.patch ---
--- xserver-xorg-video-psb-0.32.0/src/psb_crtc.c 2009-05-11 18:37:53.000000000 -0700
+++ xserver-xorg-video-psb-0.32.0/src/psb_crtc.c.new 2010-07-22 14:27:54.528657277 -0700
@@ -431,7 +431,9 @@
if (bPlaneBEnabled)
{
//current mode dot clock, HZ
- DotClockB = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+ if( output->crtc ){
+ DotClockB = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+ }
BPPB = output->scrn->bitsPerPixel;
}
}
@@ -440,7 +442,9 @@
{
if (bPlaneAEnabled)
{
- DotClockA = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+ if( output->crtc ){
+ DotClockA = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+ }
BPPA = output->scrn->bitsPerPixel;
}
}
Index: xorg-x11-drv-psb.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-psb/devel/xorg-x11-drv-psb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-psb.spec 13 Jul 2010 23:17:57 -0000 1.1
+++ xorg-x11-drv-psb.spec 17 Sep 2010 10:18:30 -0000 1.2
@@ -5,7 +5,7 @@
Summary: Intel GMA500 (Poulsbo) video driver
Name: xorg-x11-drv-psb
Version: 0.32.0
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://netbook-remix.archive.canonical.com/updates/pool/public/x/xserver-...
Source0: http://netbook-remix.archive.canonical.com/updates/pool/public/x/xserver-...
# Causes psb module to be loaded when a GMA500 adapter PCI ID is found
@@ -32,8 +32,12 @@
# Fix up an include of the internal exa.h rather than the public one
# Thanks Eric Piel
Patch8: xorg-x11-drv-psb-0.32.0-exa_header.patch
-# Use exa_mixed not classic - Yves De Muyter
-Patch9: xorg-x11-drv-psb-0.31.0-mixed.patch
+# From Yves De Muyter - fix problems with using 3D and video playback
+Patch9: xorg-x11-drv-psb-0.32.0-mixed.patch
+# From Yves - fix a problem with Xv
+Patch10: xorg-x11-drv-psb-0.32.0-xv.patch
+# From Yves - fix blank screen when rotating 90 degrees
+Patch11: xorg-x11-drv-psb-0.32.0-rotate.patch
License: MIT
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -84,8 +88,11 @@
%patch5 -p1 -b .unused
%patch6 -p1 -b .assert
%patch7 -p1 -b .addinfo
-%patch8 -p1 -b .exaheader
+%patch8 -p1 -b .header
%patch9 -p1 -b .mixed
+%patch10 -p1 -b .xv
+%patch11 -p1 -b .rotate
+
iconv -f iso-8859-15 -t utf-8 -o man/psb.man.utf8 man/psb.man && mv man/psb.man.utf8 man/psb.man
@@ -139,6 +146,13 @@
%{_mandir}/man4/*.4*
%changelog
+* Thu Jul 22 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-4
+- add rotate.patch, from Yves: fixes 90 degree rotation
+
+* Thu Jul 15 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-3
+- add patches from Yves de Muyter, Ubuntu community and Eric Piel for
+ later X compatibility
+
* Fri May 21 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-2
- add several patches from Olivier Blin at Mandriva for later X compatibility
14 years, 2 months
rpms/vlc-phonon-backend/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc-phonon-backend/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsZ20284/rpms/vlc-phonon-backend/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module vlc-phonon-backend
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: vlc-phonon-backend
# $Id: Makefile,v 1.1 2010/09/16 17:16:34 kwizart Exp $
NAME := vlc-phonon-backend
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
14 years, 2 months
rpms/vlc-phonon-backend Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc-phonon-backend
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsZ20284/rpms/vlc-phonon-backend
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module vlc-phonon-backend
--- NEW FILE Makefile ---
# Top level Makefile for module vlc-phonon-backend
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
14 years, 2 months
rpms/vlc-phonon-backend/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc-phonon-backend/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsZ20284/rpms/vlc-phonon-backend/devel
Log Message:
Directory /cvs/free/rpms/vlc-phonon-backend/devel added to the repository
14 years, 2 months
rpms/vlc-phonon-backend - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc-phonon-backend
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsZ20284/rpms/vlc-phonon-backend
Log Message:
Directory /cvs/free/rpms/vlc-phonon-backend added to the repository
14 years, 2 months
rpms/OpenEXR_Viewers-nonfree/devel .cvsignore, 1.2, 1.3 OpenEXR_Viewers-nonfree.spec, 1.7, 1.8 openexr_viewers-1.0.1-gcc44.patch, 1.2, 1.3 sources, 1.2, 1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2862/devel
Modified Files:
.cvsignore OpenEXR_Viewers-nonfree.spec
openexr_viewers-1.0.1-gcc44.patch sources
Log Message:
Rsync with fedora OpenEXR_Viewer
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 15 Oct 2008 14:25:27 -0000 1.2
+++ .cvsignore 16 Sep 2010 12:49:43 -0000 1.3
@@ -1 +1 @@
-openexr_viewers-1.0.1.tar.gz
+openexr_viewers-1.0.2.tar.gz
Index: OpenEXR_Viewers-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/OpenEXR_Viewers-nonfree.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- OpenEXR_Viewers-nonfree.spec 29 Mar 2009 15:05:07 -0000 1.7
+++ OpenEXR_Viewers-nonfree.spec 16 Sep 2010 12:49:43 -0000 1.8
@@ -11,8 +11,8 @@
%endif
Name: %{real_name}
-Version: 1.0.1
-Release: 6%{?dist}
+Version: 1.0.2
+Release: 2%{?dist}
Summary: Viewers programs for OpenEXR
Group: Applications/Multimedia
@@ -23,11 +23,12 @@
Patch1: openexr_viewers-1.0.1-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libtool
+
BuildRequires: OpenEXR_CTL-devel
BuildRequires: OpenEXR_CTL
BuildRequires: fltk-devel
%if %with_Cg
-ExclusiveArch: i586 x86_64
BuildRequires: Cg
BuildRequires: freeglut-devel
Provides: OpenEXR_Viewers = %{version}
@@ -70,6 +71,12 @@
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .gcc44
+%if %{_lib} == lib64
+sed -i -e 's|ACTUAL_PREFIX/lib/CTL|ACTUAL_PREFIX/lib64/CTL|' configure.ac
+%endif
+#Needed to update CTL compiler test
+autoconf
+
%build
export CXXFLAGS="$RPM_OPT_FLAGS -L%{_libdir}"
@@ -127,19 +134,27 @@
%endif
%changelog
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.1-6
-- rebuild for new F11 features
+* Sun Sep 05 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.2-2
+- Fix CTL Module search path on lib64
+- Fix OpenEXR_CTL detection at build time.
+
+* Mon Aug 23 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.2-1
+- Update to 1.0.2
+
+* Tue Oct 20 2009 kwizart < kwizart at gmail.com > - 1.0.1-7
+- Rebuild for F-12
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 1.0.1-5
-- Switch i386 to i586
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Thu Feb 12 2009 kwizart < kwizart at gmail.com > - 1.0.1-4.1
+* Thu Feb 12 2009 kwizart < kwizart at gmail.com > - 1.0.1-4
- Rebuild for gcc44
-- Restore build for i386 and x86_64 for now.
-* Wed Oct 15 2008 kwizart < kwizart at gmail.com > - 1.0.1-3
-- Fix: we are -nonfree
-- Cg only exist on i386 x86_64
+* Fri Oct 17 2008 kwizart < kwizart at gmail.com > - 1.0.1-3
+- Rebuild for F-10
* Sat May 10 2008 kwizart < kwizart at gmail.com > - 1.0.1-2
- Ghost the alternative provides
openexr_viewers-1.0.1-gcc44.patch:
applyCtl.cpp | 2 ++
1 file changed, 2 insertions(+)
Index: openexr_viewers-1.0.1-gcc44.patch
===================================================================
RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/openexr_viewers-1.0.1-gcc44.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openexr_viewers-1.0.1-gcc44.patch 12 Feb 2009 23:23:13 -0000 1.2
+++ openexr_viewers-1.0.1-gcc44.patch 16 Sep 2010 12:49:43 -0000 1.3
@@ -17,22 +17,3 @@
#include <iostream>
using namespace std;
-diff -up openexr_viewers-1.0.1/playexr/ctlToLut.cpp.gcc44 openexr_viewers-1.0.1/playexr/ctlToLut.cpp
---- openexr_viewers-1.0.1/playexr/ctlToLut.cpp.gcc44 2009-02-13 00:15:27.000000000 +0100
-+++ openexr_viewers-1.0.1/playexr/ctlToLut.cpp 2009-02-13 00:16:28.000000000 +0100
-@@ -48,6 +48,7 @@
- #include <ImfHeader.h>
- #include <ImfFrameBuffer.h>
- #include <cassert>
-+ #include <cstdio>
- #include <iostream>
-
- using namespace std;
-@@ -60,6 +61,7 @@
- #include <ImfStandardAttributes.h>
- #include <ImfHeader.h>
- #include <cassert>
-+ #include <cstdio>
- #include <iostream>
-
- using namespace std;
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/OpenEXR_Viewers-nonfree/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Oct 2008 14:25:27 -0000 1.2
+++ sources 16 Sep 2010 12:49:43 -0000 1.3
@@ -1 +1 @@
-e7b77c320a00cd89ef50605ba2a374cd openexr_viewers-1.0.1.tar.gz
+5d4c74ebcaf942267b0353e4c53f8b9e openexr_viewers-1.0.2.tar.gz
14 years, 2 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.43,1.44
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1904/devel
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix OpenCL support
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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xorg-x11-drv-nvidia.spec 5 Sep 2010 10:55:17 -0000 1.43
+++ xorg-x11-drv-nvidia.spec 16 Sep 2010 12:38:35 -0000 1.44
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 256.53
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -180,6 +180,7 @@
install -m 0755 -d $RPM_BUILD_ROOT%{nvidialibdir}/tls/
install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/
+install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/
install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/
# .. but some in a different place
@@ -219,8 +220,9 @@
ln -s ${lib##*/} ${lib%.%{version}}.1
done
-# OpenCL is really just a link to libcuda.so?
-ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so.1
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so
+
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
@@ -331,6 +333,9 @@
%changelog
+* Thu Sep 16 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.53-2
+- Fix OpenCL support
+
* Tue Aug 31 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.53-1
- Update to 256.53
14 years, 2 months
rpms/xorg-x11-drv-nvidia/F-13 xorg-x11-drv-nvidia.spec,1.43,1.44
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1904/F-13
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix OpenCL support
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-13/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- xorg-x11-drv-nvidia.spec 5 Sep 2010 10:56:20 -0000 1.43
+++ xorg-x11-drv-nvidia.spec 16 Sep 2010 12:38:35 -0000 1.44
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 256.53
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -180,6 +180,7 @@
install -m 0755 -d $RPM_BUILD_ROOT%{nvidialibdir}/tls/
install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/
+install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/
install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/
# .. but some in a different place
@@ -219,8 +220,9 @@
ln -s ${lib##*/} ${lib%.%{version}}.1
done
-# OpenCL is really just a link to libcuda.so?
-ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so.1
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so
+
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
@@ -331,6 +333,9 @@
%changelog
+* Thu Sep 16 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.53-2
+- Fix OpenCL support
+
* Tue Aug 31 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:256.53-1
- Update to 256.53
14 years, 2 months
rpms/qmmp-plugins-freeworld/F-13 .cvsignore, 1.8, 1.9 qmmp-plugins-freeworld.spec, 1.11, 1.12 sources, 1.8, 1.9
by Karel Volný
Author: kvolny
Update of /cvs/free/rpms/qmmp-plugins-freeworld/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25396
Modified Files:
.cvsignore qmmp-plugins-freeworld.spec sources
Log Message:
* Thu Sep 16 2010 Karel Volný <kvolny(a)redhat.com> 0.4.2-1
- version bump
- fixes possible freezes with mplayer plugin
- new MMS transport plugin
- BuildRequires libmms-devel for MMS support
- BuildRequires enca-devel for encoding detection
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 21 Apr 2010 09:01:19 -0000 1.8
+++ .cvsignore 16 Sep 2010 10:23:08 -0000 1.9
@@ -1 +1 @@
-qmmp-0.3.4.tar.bz2
+qmmp-0.4.2.tar.bz2
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-13/qmmp-plugins-freeworld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qmmp-plugins-freeworld.spec 21 Apr 2010 09:01:19 -0000 1.11
+++ qmmp-plugins-freeworld.spec 16 Sep 2010 10:23:08 -0000 1.12
@@ -1,5 +1,5 @@
Name: qmmp-plugins-freeworld
-Version: 0.3.4
+Version: 0.4.2
Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
@@ -14,8 +14,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: cmake ffmpeg-devel >= 0.4.9-0.47.20080614
+BuildRequires: enca-devel
BuildRequires: faad2-devel
BuildRequires: libmad-devel qt-devel >= 4.3
+BuildRequires: libmms-devel
BuildRequires: taglib-devel libcurl-devel
BuildRequires: qmmp%{?_isa} = %{version}
Requires: qmmp%{?_isa} = %{version}
@@ -37,12 +39,15 @@
-e 's|<avformat.h|<libavformat/avformat.h|g' \
-e 's|g/avformat.h|g/libavformat/avformat.h|g' \
src/plugins/Input/ffmpeg/decoder_ffmpeg.h \
- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp \
- src/plugins/Input/ffmpeg/detailsdialog.cpp
+ src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
%build
+# the plugin groups, as separated by newlines, are:
+# Transport, Input, Output, Effect, Visual, General, File Dialogs
%cmake \
+ -D USE_CURL:BOOL=FALSE \
+\
-D USE_FLAC:BOOL=FALSE \
-D USE_VORBIS:BOOL=FALSE \
-D USE_MPC:BOOL=FALSE \
@@ -51,15 +56,20 @@
-D USE_WAVPACK:BOOL=FALSE \
-D USE_CUE:BOOL=FALSE \
-D USE_CDA:BOOL=FALSE \
+\
-D USE_ALSA:BOOL=FALSE \
-D USE_OSS:BOOL=FALSE \
-D USE_JACK:BOOL=FALSE \
-D USE_PULSE:BOOL=FALSE \
+ -D USE_NULL:BOOL=FALSE \
+\
-D USE_SRC:BOOL=FALSE \
-D USE_BS2B:BOOL=FALSE \
+ -D USE_LADSPA:BOOL=FALSE \
+\
-D USE_ANALYZER:BOOL=FALSE \
-D USE_PROJECTM:BOOL=FALSE \
- -D USE_DBUS:BOOL=FALSE \
+\
-D USE_MPRIS:BOOL=FALSE \
-D USE_SCROBBLER:BOOL=FALSE \
-D USE_STATICON:BOOL=FALSE \
@@ -68,22 +78,29 @@
-D USE_HAL:BOOL=FALSE \
-D USE_HOTKEY:BOOL=FALSE \
-D USE_FILEOPS:BOOL=FALSE \
+ -D USE_COVER:BOOL=FALSE \
+ -D USE_KDENOTIFY:BOOL=FALSE \
+\
-D USE_QMMP_DIALOG:BOOL=FALSE \
+\
-D CMAKE_INSTALL_PREFIX=/usr \
-D LIB_DIR=%{_lib} \
./
+
+make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Engines/mplayer
make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/aac
make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/ffmpeg
make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/mad
-make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/mplayer
+make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Transports/mms
%install
rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install -C src/plugins/Engines/mplayer
make DESTDIR=%{buildroot} install -C src/plugins/Input/aac
make DESTDIR=%{buildroot} install -C src/plugins/Input/ffmpeg
make DESTDIR=%{buildroot} install -C src/plugins/Input/mad
-make DESTDIR=%{buildroot} install -C src/plugins/Input/mplayer
+make DESTDIR=%{buildroot} install -C src/plugins/Transports/mms
%clean
@@ -92,8 +109,12 @@
%files
%defattr(0755,root,root,0755)
-%dir %{_libdir}/qmmp/Input
+# there's only mplayer plugin now, so own the directory
+%dir %{_libdir}/qmmp/Engines
+%{_libdir}/qmmp/Engines/*.so
+# Input & Transports dirs are owned by qmmp already
%{_libdir}/qmmp/Input/*.so
+%{_libdir}/qmmp/Transports/*.so
%post -p /sbin/ldconfig
@@ -102,6 +123,13 @@
%changelog
+* Thu Sep 16 2010 Karel Volný <kvolny(a)redhat.com> 0.4.2-1
+- version bump
+- fixes possible freezes with mplayer plugin
+- new MMS transport plugin
+- BuildRequires libmms-devel for MMS support
+- BuildRequires enca-devel for encoding detection
+
* Tue Apr 20 2010 Karel Volný <kvolny(a)redhat.com> 0.3.4-1
- version bump
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-13/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 21 Apr 2010 09:01:19 -0000 1.8
+++ sources 16 Sep 2010 10:23:08 -0000 1.9
@@ -1 +1 @@
-000eed2eb5fbbcc1937f490dddf3609c qmmp-0.3.4.tar.bz2
+4ae6d4db68852bf985d3f0f94fc210a9 qmmp-0.4.2.tar.bz2
14 years, 2 months