Author: w.kier Date: Mon Mar 9 18:41:54 2009 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- reverted to 1.38
---- Files affected:
SPECS:
dshowserver.spec (1.7 -> 1.8) , fetchsrc_request (1.18 -> 1.19) ,
mplayer.spec (1.369.2.11 -> 1.369.2.12) , xorg-driver-video-fglrx.spec (1.139
-> 1.140)
---- Diffs:
================================================================
Index: SPECS/dshowserver.spec
diff -u SPECS/dshowserver.spec:1.7 SPECS/dshowserver.spec:1.8
--- SPECS/dshowserver.spec:1.7 Mon Nov 3 13:20:07 2008
+++ SPECS/dshowserver.spec Mon Mar 9 19:41:46 2009
@@ -1,141 +1,106 @@
# $Revision$, $Date$
+
# Conditional build:
%bcond_with static # static package for use with x86_64 systems
-#
-%define svn 82
-%define rel 0.1
-Summary: Win32 CoreAVC H.264 codec helper
+%define pname dshowserver
+%define _snap svn
+%define _rel 82
+
+Summary: Win32 CoreAVC H.264 codec helper.
Summary(pl.UTF-8): Serwer windowsowego kodeka CoreAVC H.264.
-Name: dshowserver
-Version: 0.1
-Release: 0.%{svn}.%{rel}
+Name: %{pname}%{?with_static:-static}
+Version: %{_snap}%{_rel}
+Release: 0.1
License: GPL
-Group: X11/Applications/Multimedia
-Source0: %{name}-0.svn%{svn}.tar.bz2
+Group: X11/Multimedia
+Source0: %{pname}-%{version}.tar.bz2
# Source0-md5: 648492583080c4359040358453670452
-Patch0: %{name}-codecspath.patch
-Patch1: %{name}-optflags.patch
-URL: http://code.google.com/p/coreavc-for-linux/
-%ifarch %{x8664}
-BuildRequires: gcc-multilib
-%{?with_static:BuildRequires: glibc-static(i686)}
-%else
-%{?with_static:BuildRequires: glibc-static}
-%endif
-BuildRequires: rpmbuild(macros) >= 1.453
-BuildRequires: sed >= 4.0
-ExclusiveArch: %{ix86} %{x8664}
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define x8664_flags -m32
-%define specflags_x86_64 %{x8664_flags}
-%define specflags_amd64 %{x8664_flags}
-%define specflags_ia32e %{x8664_flags}
+Patch0: %{pname}-codecspath.patch
+URL: http://code.google.com/
+BuildRequires: glibc-static
%description
-CoreAVC is a proprietary Windows codec for H.264 video decoding. It is
-much faster than any currently available open-source codecs. Being
-multi-threaded, and able to play PAFF streams, it can handle HD
-H.264/AVC streams that no freely available codecs can. CoreAVC is
-reasonably priced, but it is Windows only. Dshowserver serves CoreAVC
-for mythtv, mplayer and xine. Dshowserver can work under 32 or 64 bits
-linux system. For 64 bits use static binary compiled in 32 bits
-environement.
+CoreAVC is a proprietary Windows codec for H.264 video decoding.
+It is much faster than any currently available open-source codecs.
+Being multi-threaded, and able to play PAFF streams,
+it can handle HD H.264/AVC streams that no freely available codecs can.
+CoreAVC is reasonably priced, but it is Windows only.
+Dshowserver serves CoreAVC for mythtv, mplayer and xine.
+Dshowserver can work under 32 or 64 bits linux system.
+For 64 bits use static binary compiled in 32 bits environement.
%description -l pl.UTF-8
-CoreAVC to komercyjny kodek H.264 dla systemu Windows. Jest znacznie
-szybszy od dowolnego wolnego kodeka. Obsługujac wielowatkowosc moze
-odtwarzac strumienie zakodowane z uzyciem interlacingu PAFF. Odtwarza
-strumienie HD H.264/AVC. Kosztuje rozsadnie, ale dostepny jest tylko
-dla Windows. Dhowserevr implementuje obsluge tego kodeka przez mythtv,
-mplayer i xine. Dshowserver moze byc uzyty w architekturach x86 i
-x86_64. Jezeli twoj system jest 64 bitowy. Uzyj statycznych binariow
+CoreAVC to komercyjny kodek H.264 dla systemu Windows. Jest znacznie szybszy
+od dowolnego wolnego kodeka. Obsługujac wielowatkowosc moze odtwarzac
+strumienie zakodowane z uzyciem interlacingu PAFF.
+Odtwarza strumienie HD H.264/AVC.
+Kosztuje rozsadnie, ale dostepny jest tylko dla Windows.
+Dhowserevr implementuje obsluge tego kodeka przez mythtv, mplayer i xine.
+Dshowserver moze byc uzyty w architekturach x86 i x86_64.
+Jezeli twoj system jest 64 bitowy. Uzyj statycznych binariow
zbudowanych w 32 bitowym srodowisku.
-%package -n registercodec
-Summary: Utility to register win32 CoreAVC H.264 codec
-Summary(pl.UTF-8): Narzedzie do rejestracji windowsowego kodeka CoreAVC
H.264.
-Group: X11/Applications/Multimedia
-
-%description -n registercodec
-Utility to register win32 CoreAVC H.264 codec for usage with
-mythtv/mplayer/xine.
-
-%description -n registercodec -l pl.UTF-8
-Narzedzie do przeprowadzenia rejestracji komercyjnego kodeka CoreAVC
-H.264.
+
+%package -n registercodec%{?with_static:-static}
+Summary: Utility to register win32 CoreAVC H.264 codec.
+Summary(pl.UTF-8): Narzedzie do rejestracji windowsowego kodeka CoreAVC
H.264.
+Group: X11/Multimedia
+
+%description -n registercodec%{?with_static:-static}
+Utility to register win32 CoreAVC H.264 codec for usage with
mythtv/mplayer/xine.
+
+%description -l pl.UTF-8 -n registercodec%{?with_static:-static}
+Narzedzie do przeprowadzenia rejestracji komercyjnego kodeka CoreAVC H.264.
%prep
-%setup -q -n %{name}-svn%{svn}
-%patch0 -p1
-%patch1 -p1
+cd %{_builddir}
+rm -rf %{pname}-%{version}
+tar jxvf %{SOURCE0}
+cd %{pname}-%{version}
-%if "%{cc_version}" < "3.4"
-# CC version is arbitary (just to be > 3.3)
-%{__sed} -i -e 's/-Wno-pointer-sign//;s/-Wdeclaration-after-statement//'
{loader,dshowserver}/Makefile
-%endif
+%patch0 -p1
%build
-cat << 'EOF' > config.mak
-override CC = %{__cc}
-override OPTFLAGS = %{rpmcflags}
-override LDFLAGS = %{rpmldflags}
-
-%{?with_static:STATIC = 1}
-
-AR = ar
-RANLIB = ranlib
-OBJDIR = ../objs
-EOF
-
-%{__make} -C dshowserver
+cd %{pname}-%{version}
+make -C dshowserver %{?with_static:STATIC=1}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
+cd %{pname}-%{version}
+
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+
install dshowserver/dshowserver $RPM_BUILD_ROOT%{_bindir}/dshowserver
install dshowserver/registercodec $RPM_BUILD_ROOT%{_bindir}/registercodec
-cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man1
+
+install man/* $RPM_BUILD_ROOT%{_mandir}/man1
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+
+%postun
+
%files
-%defattr(644,root,root,755)
%attr(755,root,video) %{_bindir}/dshowserver
-%{_mandir}/man1/ds*
+%attr(644,root,root) %{_mandir}/man1/ds*
-%files -n registercodec
-%defattr(644,root,root,755)
+%files -n registercodec%{?with_static:-static}
%attr(755,root,video) %{_bindir}/registercodec
-%{_mandir}/man1/re*
+%attr(644,root,root) %{_mandir}/man1/re*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
-$Log$
-Revision 1.7 2008/11/03 12:20:07 sparky
-- build 32bit binary in x8664 (using multilib)
-- forcing static on x8664 is pointless
-- use config.mak file instead of command line
-
-Revision 1.6 2008/11/03 09:50:18 glen
-- don't use svn rev as version
-- macros cleanup, possible gcc 3.3 buildfixes
+Except wk
-Revision 1.5 2008/11/03 08:50:06 grzegorz
-- some cleanups
-
-Revision 1.4 2008/11/03 08:25:23 glen
-- alpha and numeric comparision is inconsistent with different rpm versions
-
-Revision 1.3 2008/11/03 08:24:10 glen
-- grzegorz - you should pldize external specs, not just add them
-
-Revision 1.2 2008/11/03 07:54:56 grzegorz
-- update from WK
+$Log$
+Revision 1.8 2009/03/09 18:41:46 w.kier
+- reverted to 1.38
-Revision 1.1 2008/10/23 13:36:46 grzegorz
-- initial spec by Wieslaw Kierbedz
+Revision 0.1 2008/10/12 20:20:41 wk
+- initial release
================================================================
Index: SPECS/fetchsrc_request
diff -u SPECS/fetchsrc_request:1.18 SPECS/fetchsrc_request:1.19
--- SPECS/fetchsrc_request:1.18 Tue Dec 25 17:35:57 2007
+++ SPECS/fetchsrc_request Mon Mar 9 19:41:46 2009
@@ -2,15 +2,15 @@
# $Id$
#
# Sending by
-MAILER='/usr/sbin/sendmail'
-# MAILER='/usr/bin/msmtp'
+#MAILER='/usr/sbin/sendmail'
+ MAILER='/usr/bin/msmtp'
# Sending via
VIA="SENDMAIL"
-#VIA="localhost"
-VIA_ARGS=""
+#VIA="agimoja"
+#VIA_ARGS=""
#VIA_ARGS="some additional flags"
# e.g. for msmtp:
-# VIA_ARGS='-a gmail'
+#VIA_ARGS='--host=agimoja.farba.eu.org --port=25 -f [email protected]'
#
# DISTFILES EMAIL
DMAIL="[email protected]"
================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.369.2.11 SPECS/mplayer.spec:1.369.2.12
--- SPECS/mplayer.spec:1.369.2.11 Tue Oct 23 00:54:33 2007
+++ SPECS/mplayer.spec Mon Mar 9 19:41:46 2009
@@ -57,7 +57,8 @@
%bcond_with amr # enable 3GPP Adaptive Multi Rate (AMR) speech
codec support
%bcond_without gnomess # disable controling gnome screensaver
%bcond_with ssse3 # sse3 optimizations (needs binutils >= 2.16.92)
-
+%bcond_without dshowserver # disable directshow codecs server
+#%{?without_dshowserver: %without_win32}
%ifnarch %{ix86}
%undefine with_win32
%undefine with_quicktime
@@ -74,7 +75,7 @@
%define _suf 32
%endif
-%define _rel 0.1
+%define _rel 0.1wk
%define _rc rc2
Summary: MPlayer - THE Movie Player for UN*X
@@ -104,6 +105,7 @@
Source8: %{name}.desktop
# http://www.on2.com/gpl/mplayer/
Source9:
http://www.on2.com/gpl/mplayer/2007-10-09-mencoder-on2flixenglinux.tar.bz2
+%{!?without_dshowserver:Source50: coreserve}
# Source9-md5: 2361e56b40f52dfc20131e458e2aed38
Patch1: %{name}-cp1250-fontdesc.patch
Patch2: %{name}-codec.patch
@@ -122,6 +124,7 @@
Patch19: %{name}-on2flix.patch
Patch22: %{name}-ffmpeg.patch
Patch23: %{name}-live.patch
+%{!?without_dshowserver:Patch50: %{name}-dshowserver.patch}
URL: http://www.mplayerhq.hu/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: OpenAL-devel
@@ -336,6 +339,7 @@
%patch22 -p1
%patch23 -p1
+%{!?without_dshowserver:%patch50 -p1}
%build
%if %{with shared}
@@ -489,12 +493,14 @@
cp -r font-* $RPM_BUILD_ROOT%{_datadir}/mplayer
ln -sf font-arial-iso-8859-2/font-arial-24-iso-8859-2
$RPM_BUILD_ROOT%{_datadir}/mplayer/font
+
%if %{with gui}
ln -s Blue $RPM_BUILD_ROOT%{_datadir}/%{name}/Skin/default
install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
%endif
install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}
install %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}
+%{!?without_dshowserver:install %{SOURCE50}
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/codecs}
# man pages
install DOCS/man/cs/*.1 $RPM_BUILD_ROOT%{_mandir}/cs/man1
@@ -584,6 +590,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.369.2.12 2009/03/09 18:41:46 w.kier
+- reverted to 1.38
+
Revision 1.369.2.11 2007/10/22 22:54:33 glen
- builds with more than one jobserver
================================================================
Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.139
SPECS/xorg-driver-video-fglrx.spec:1.140
--- SPECS/xorg-driver-video-fglrx.spec:1.139 Wed Feb 25 22:04:55 2009
+++ SPECS/xorg-driver-video-fglrx.spec Mon Mar 9 19:41:46 2009
@@ -31,7 +31,7 @@
%define arch_dir x86_64
%endif
-%define rel 2
+%define rel 2.1
%define pname xorg-driver-video-fglrx
Summary: Linux Drivers for ATI graphics accelerators
Summary(pl.UTF-8): Sterowniki do akceleratorów graficznych ATI
@@ -159,7 +159,7 @@
Release: %{r...@%{_kernel_ver_str}
License: ATI
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
+#%{?with_dist_kernel:%requires_releq_kernel}
Requires(post,postun): /sbin/depmod
%description -n kernel%{_alt_kernel}-video-firegl
@@ -366,6 +366,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.140 2009/03/09 18:41:46 w.kier
+- reverted to 1.38
+
Revision 1.139 2009/02/25 21:04:55 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dshowserver.spec?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fetchsrc_request?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mplayer.spec?r1=1.369.2.11&r2=1.369.2.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-fglrx.spec?r1=1.139&r2=1.140&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
