rpms/avidemux/F-8 avidemux.spec,1.2,1.3
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23314/F-8
Modified Files:
avidemux.spec
Log Message:
Fix bz 178
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-8/avidemux.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avidemux.spec 27 Sep 2008 22:37:36 -0000 1.2
+++ avidemux.spec 26 Nov 2008 00:45:46 -0000 1.3
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.4.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -83,10 +83,10 @@
%package cli
Summary: CLI for %{name}
Group: Applications/Multimedia
-Provides: %{name}-cli = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description cli
-This package provides command-line interface for %{name}
+This package provides command-line interface for %{name}.
%package gtk
Summary: GTK GUI for %{name}
@@ -96,18 +96,20 @@
# Slightly higher so it is default, but it can be avoided by installing
# avidemux-qt directly or it can be removed later once avidemux-qt is installed
Provides: %{name}-gui = %{version}-%{release}.1
+Requires: %{name} = %{version}-%{release}
%description gtk
-This package provides the GTK interface for %{name}
+This package provides the GTK interface for %{name}.
%package qt
Summary: QT GUI for %{name}
Group: Applications/Multimedia
BuildRequires: qt4-devel
Provides: %{name}-gui = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description qt
-This package provides the QT interface for %{name}
+This package provides the QT interface for %{name}.
%prep
%setup -q -n avidemux_%{version}
@@ -159,6 +161,10 @@
%{_datadir}/applications/*qt*.desktop
%changelog
+* Tue Nov 25 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-7
+- Don't uselessly provide avidemux-cli
+- Make GUI and CLI subpackages require the main package (fixes bz#178)
+
* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-6
- Rebuild due to missing .desktop files
16 years, 1 month
rpms/avidemux/devel avidemux.spec,1.8,1.9
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23314/devel
Modified Files:
avidemux.spec
Log Message:
Fix bz 178
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- avidemux.spec 27 Sep 2008 22:37:36 -0000 1.8
+++ avidemux.spec 26 Nov 2008 00:45:47 -0000 1.9
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.4.3
-Release: 5%{?dist}
+Release: 7%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -83,10 +83,10 @@
%package cli
Summary: CLI for %{name}
Group: Applications/Multimedia
-Provides: %{name}-cli = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description cli
-This package provides command-line interface for %{name}
+This package provides command-line interface for %{name}.
%package gtk
Summary: GTK GUI for %{name}
@@ -96,18 +96,20 @@
# Slightly higher so it is default, but it can be avoided by installing
# avidemux-qt directly or it can be removed later once avidemux-qt is installed
Provides: %{name}-gui = %{version}-%{release}.1
+Requires: %{name} = %{version}-%{release}
%description gtk
-This package provides the GTK interface for %{name}
+This package provides the GTK interface for %{name}.
%package qt
Summary: QT GUI for %{name}
Group: Applications/Multimedia
BuildRequires: qt4-devel
Provides: %{name}-gui = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description qt
-This package provides the QT interface for %{name}
+This package provides the Qt interface for %{name}.
%prep
%setup -q -n avidemux_%{version}
@@ -159,6 +161,13 @@
%{_datadir}/applications/*qt*.desktop
%changelog
+* Tue Nov 25 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-7
+- Don't uselessly provide avidemux-cli
+- Make GUI and CLI subpackages require the main package (fixes bz#178)
+
+* Tue Nov 25 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-6
+- Bump release to fix EVR
+
* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-5
- Add CMake patch for PPC64
- Update patches for 2.4.3
16 years, 1 month
rpms/unrar/EL-5 unrar-3.7.8-fixes.patch, NONE, 1.1 unrar.spec, 1.2, 1.3
by Orion Poplawski
Author: orion
Update of /cvs/nonfree/rpms/unrar/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22641
Modified Files:
unrar.spec
Added Files:
unrar-3.7.8-fixes.patch
Log Message:
* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 3.7.8-3
- Added libunrar sub-packages
- Clarified license
- Added unrar robustness patches
unrar-3.7.8-fixes.patch:
--- NEW FILE unrar-3.7.8-fixes.patch ---
diff -up unrar/dll.cpp.fix unrar/dll.cpp
--- unrar/dll.cpp.fix 2007-09-10 13:49:28.000000000 +0200
+++ unrar/dll.cpp 2008-10-25 22:41:06.000000000 +0200
@@ -275,7 +275,8 @@ int PASCAL ProcessFile(HANDLE hArcData,i
strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T");
Data->Cmd.Test=Operation!=RAR_EXTRACT;
bool Repeat=false;
- Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat);
+ if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false)
+ return (ERAR_UNKNOWN);
while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD)
{
diff -up unrar/extract.cpp.fix unrar/extract.cpp
--- unrar/extract.cpp.fix 2007-09-10 13:49:28.000000000 +0200
+++ unrar/extract.cpp 2008-10-25 22:41:06.000000000 +0200
@@ -311,6 +311,7 @@ bool CmdExtract::ExtractCurrentFile(Comm
char CurVolName[NM];
strcpy(CurVolName,ArcName);
+ if(strcmp(ArcName,"")==0) return(false);
VolNameToFirstName(ArcName,ArcName,(Arc.NewMhd.Flags & MHD_NEWNUMBERING));
if (stricomp(ArcName,CurVolName)!=0 && FileExist(ArcName))
{
diff -up unrar/makefile.unix.fix unrar/makefile.unix
--- unrar/makefile.unix.fix 2008-10-25 22:41:06.000000000 +0200
+++ unrar/makefile.unix 2008-10-25 22:42:24.000000000 +0200
@@ -86,7 +86,7 @@ COMPILE=$(CXX) $(CXXFLAGS) $(DEFINES)
LINK=$(CXX)
UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
-LIB_OBJ=filestr.o scantree.o dll.o
+LIB_OBJ=filestr.o recvol.o rs.o scantree.o dll.o
OBJECTS=rar.o strlist.o strfn.o pathfn.o int64.o savepos.o global.o file.o filefn.o filcreat.o \
archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \
@@ -116,4 +116,4 @@ sfx: $(OBJECTS)
lib: WHAT=RARDLL
lib: $(OBJECTS) $(LIB_OBJ)
@rm -f libunrar.so
- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ $(LINK) -shared -Wl,-soname,libunrar.so.3.7 -o libunrar.so.3.7 $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
Index: unrar.spec
===================================================================
RCS file: /cvs/nonfree/rpms/unrar/EL-5/unrar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unrar.spec 25 Jul 2008 06:12:22 -0000 1.2
+++ unrar.spec 25 Nov 2008 04:38:23 -0000 1.3
@@ -1,12 +1,16 @@
+# Might be needed to apply fuzzy patches with recent rpm
+#%%define _default_patch_fuzz 2
+
Name: unrar
Version: 3.7.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Utility for extracting, testing and viewing RAR archives
-License: Freeware
+License: Freeware with further limitations
Group: Applications/Archiving
URL: http://www.rarlab.com/rar_archiver.htm
Source0: http://www.rarlab.com/rar/unrarsrc-%{version}.tar.gz
Patch0: http://ftp.debian.org/debian/pool/non-free/u/unrar-nonfree/unrar-nonfree_...
+Patch1: unrar-3.7.8-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,24 +20,57 @@
1.50 and above.
+%package -n libunrar
+Summary: Decompress library for RAR v3 archives
+Group: System Environment/Libraries
+
+%description -n libunrar
+The libunrar library allows programs linking against it to decompress
+existing RAR v3 archives.
+
+
+%package -n libunrar-devel
+Summary: Development files for libunrar
+Group: Development/Libraries
+Requires: libunrar = %{version}-%{release}
+Provides: libunrar3-%{version}
+
+%description -n libunrar-devel
+The libunrar-devel package contains libraries and header files for
+developing applications that use libunrar.
+
+
%prep
%setup -q -n %{name}
%patch0 -p1
+%patch1 -p1 -b .fix
%build
make %{?_smp_mflags} -f makefile.unix \
- CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS" STRIP=:
+ CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" STRIP=: RANLIB=ranlib
+make %{?_smp_mflags} -f makefile.unix lib \
+ CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" STRIP=: RANLIB=ranlib
%install
-rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 unrar $RPM_BUILD_ROOT%{_bindir}/unrar
-install -Dpm 644 debian/unrar.1 $RPM_BUILD_ROOT%{_mandir}/man1/unrar.1
+rm -rf %{buildroot}
+install -Dpm 755 unrar %{buildroot}%{_bindir}/unrar
+install -Dpm 644 debian/unrar.1 %{buildroot}%{_mandir}/man1/unrar.1
+install -Dpm 755 libunrar.so.3.7 %{buildroot}%{_libdir}/libunrar.so.3.7
+install -Dpm 644 dll.hpp %{buildroot}/%{_includedir}/unrar/dll.hpp
+ln -s libunrar.so.3.7 %{buildroot}%{_libdir}/libunrar.so.3
+ln -s libunrar.so.3 %{buildroot}%{_libdir}/libunrar.so
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+
+%post -n libunrar -p /sbin/ldconfig
+
+
+%postun -n libunrar -p /sbin/ldconfig
%files
@@ -42,8 +79,24 @@
%{_bindir}/unrar
%{_mandir}/man1/unrar.1*
+%files -n libunrar
+%defattr(-,root,root,-)
+%doc license.txt readme.txt
+%{_libdir}/*.so.*
+
+%files -n libunrar-devel
+%defattr(-,root,root,-)
+%doc license.txt readme.txt
+%{_includedir}/*
+%{_libdir}/*.so
+
%changelog
+* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 3.7.8-3
+- Added libunrar sub-packages
+- Clarified license
+- Added unrar robustness patches
+
* Thu Jul 24 2008 Conrad Meyer <konrad(a)tylerc.org> - 3.7.8-2
- Import into RPM Fusion.
16 years, 1 month
rpms/mplayer/devel mplayer.spec,1.9,1.10
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4941
Modified Files:
mplayer.spec
Log Message:
Forgotten release bump
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mplayer.spec 24 Nov 2008 23:16:03 -0000 1.9
+++ mplayer.spec 24 Nov 2008 23:19:21 -0000 1.10
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.102.%{pre}%{?dist}
+Release: 0.103.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
16 years, 1 month
rpms/mplayer/F-9 mplayer-backing-store.patch, NONE, 1.1 mplayer-dvb.patch, NONE, 1.1 mplayer.spec, 1.4, 1.5
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4812
Modified Files:
mplayer.spec
Added Files:
mplayer-backing-store.patch mplayer-dvb.patch
Log Message:
* Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.99.20080903svn
- fix broken terminal after using dvb input (bug #117)
- disable backing store (fixes tearing on Xorg Xserver 1.5.x)
- disable samba support by default, too much dependency bloat (bug #147)
- add missing Requires for hicolor icon dirs to -gui
- drop provides and obsoletes for mplayer-mencoder (last seen for FC4)
mplayer-backing-store.patch:
--- NEW FILE mplayer-backing-store.patch ---
diff -up mplayer-export-2008-09-03/libvo/x11_common.c.bs mplayer-export-2008-09-03/libvo/x11_common.c
--- mplayer-export-2008-09-03/libvo/x11_common.c.bs 2008-08-04 08:16:23.000000000 +0200
+++ mplayer-export-2008-09-03/libvo/x11_common.c 2008-11-23 21:39:27.000000000 +0100
@@ -1250,7 +1250,7 @@ Window vo_x11_create_smooth_window(Displ
unsigned int width, unsigned int height,
int depth, Colormap col_map)
{
- unsigned long xswamask = CWBackingStore | CWBorderPixel;
+ unsigned long xswamask = CWBorderPixel;
XSetWindowAttributes xswa;
Window ret_win;
@@ -1261,7 +1261,7 @@ Window vo_x11_create_smooth_window(Displ
}
xswa.background_pixel = 0;
xswa.border_pixel = 0;
- xswa.backing_store = Always;
+ xswa.backing_store = NotUseful;
xswa.bit_gravity = StaticGravity;
ret_win =
mplayer-dvb.patch:
--- NEW FILE mplayer-dvb.patch ---
diff -up mplayer-export-2008-09-03/stream/dvb_tune.c.dvb mplayer-export-2008-09-03/stream/dvb_tune.c
--- mplayer-export-2008-09-03/stream/dvb_tune.c.dvb 2008-08-14 17:54:53.000000000 +0200
+++ mplayer-export-2008-09-03/stream/dvb_tune.c 2008-11-23 21:33:29.000000000 +0100
@@ -114,9 +114,7 @@ int dvb_open_devices(dvb_priv_t *priv, i
mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno);
return 0;
}
-#ifdef CONFIG_DVB_HEAD
- priv->sec_fd=0;
-#else
+#ifndef CONFIG_DVB_HEAD
priv->sec_fd = open(sec_dev, O_RDWR);
if(priv->sec_fd < 0)
{
diff -up mplayer-export-2008-09-03/stream/stream_dvb.c.dvb mplayer-export-2008-09-03/stream/stream_dvb.c
--- mplayer-export-2008-09-03/stream/stream_dvb.c.dvb 2008-08-14 17:54:53.000000000 +0200
+++ mplayer-export-2008-09-03/stream/stream_dvb.c 2008-11-23 21:33:29.000000000 +0100
@@ -611,9 +611,10 @@ static void dvbin_close(stream_t *stream
close(priv->dvr_fd);
close(priv->fe_fd);
-#ifdef CONFIG_DVB
+#ifndef CONFIG_DVB_HEAD
close(priv->sec_fd);
#endif
+ priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
priv->is_on = 0;
dvb_free_config(priv->config);
@@ -685,6 +686,7 @@ static int dvb_open(stream_t *stream, in
return STREAM_ERROR;
priv = (dvb_priv_t *)stream->priv;
+ priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
priv->config = dvb_get_config();
if(priv->config == NULL)
{
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-9/mplayer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer.spec 28 Oct 2008 22:27:48 -0000 1.4
+++ mplayer.spec 24 Nov 2008 23:17:19 -0000 1.5
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.98.%{pre}%{?dist}
+Release: 0.99.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -27,6 +27,10 @@
Patch12: %{name}-man-zh_CN.patch
Patch13: %{name}-CVE-2008-3827.patch
Patch14: %{name}-nodvdcss.patch
+# SVN r27892, r27893, r27897
+Patch15: %{name}-dvb.patch
+# SVN r27849
+Patch16: %{name}-backing-store.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -59,7 +63,6 @@
BuildRequires: libdvdnav-devel >= 4.1.3-1
BuildRequires: libjpeg-devel
BuildRequires: libmpcdec-devel
-BuildRequires: libsmbclient-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: lirc-devel
@@ -78,6 +81,7 @@
%{?_with_libmad:BuildRequires: libmad-devel}
%{?_with_nemesi:BuildRequires: libnemesi-devel >= 0.6.3}
%{?_with_openal:BuildRequires: openal-devel}
+%{?_with_samba:BuildRequires: libsmbclient-devel}
%{?_with_svgalib:BuildRequires: svgalib-devel}
%{?_with_xmms:BuildRequires: xmms-devel}
%if %{svn}
@@ -99,6 +103,7 @@
OpenGL, SVGAlib, fbdev, AAlib, DirectFB etc. There are also nice
antialiased shaded subtitles and OSD.
Non-default rpmbuild options:
+--with samba: Enable Samba (smb://) support
--with xmms: Enable XMMS input plugin support
--with amr: Enable AMR support
--with libmad: Enable libmad support
@@ -114,6 +119,7 @@
Summary: GUI for MPlayer
Group: Applications/Multimedia
Requires: mplayer = %{version}-%{release}
+Requires: hicolor-icon-theme
%description gui
This package contains a GUI for MPlayer and a default skin for it.
@@ -122,8 +128,6 @@
Summary: MPlayer movie encoder
Group: Applications/Multimedia
Requires: mplayer = %{version}-%{release}
-Provides: mplayer-mencoder = %{version}-%{release}
-Obsoletes: mplayer-mencoder < 1.0-0.36
%description -n mencoder
This package contains the MPlayer movie encoder.
@@ -158,6 +162,7 @@
--disable-dvdread-internal \\\
--disable-libdvdcss-internal \\\
%{!?_with_nemesi:--disable-nemesi} \\\
+ %{!?_with_samba:--disable-smb} \\\
\\\
--disable-faac-lavc \\\
--disable-mp3lame-lavc \\\
@@ -197,6 +202,8 @@
%patch12 -p1 -b .man-zh_CN
%patch13 -p0 -b .cve
%patch14 -p1 -b .nodvdcss
+%patch15 -p1 -b .dvb
+%patch16 -p1 -b .bs
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -347,6 +354,13 @@
%changelog
+* Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.99.20080903svn
+- fix broken terminal after using dvb input (bug #117)
+- disable backing store (fixes tearing on Xorg Xserver 1.5.x)
+- disable samba support by default, too much dependency bloat (bug #147)
+- add missing Requires for hicolor icon dirs to -gui
+- drop provides and obsoletes for mplayer-mencoder (last seen for FC4)
+
* Tue Oct 28 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.98.20080903svn
- rework the build system
16 years, 1 month
rpms/mplayer/devel mplayer-backing-store.patch, NONE, 1.1 mplayer-dvb.patch, NONE, 1.1 mplayer.spec, 1.8, 1.9
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4483
Modified Files:
mplayer.spec
Added Files:
mplayer-backing-store.patch mplayer-dvb.patch
Log Message:
* Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.103.20080903svn
- fix broken terminal after using dvb input (bug #117)
- disable backing store (fixes tearing on Xorg Xserver 1.5.x)
- disable samba support by default, too much dependency bloat (bug #147)
- add missing Requires for hicolor icon dirs to -gui
- drop provides and obsoletes for mplayer-mencoder (last seen for FC4)
mplayer-backing-store.patch:
--- NEW FILE mplayer-backing-store.patch ---
diff -up mplayer-export-2008-09-03/libvo/x11_common.c.bs mplayer-export-2008-09-03/libvo/x11_common.c
--- mplayer-export-2008-09-03/libvo/x11_common.c.bs 2008-08-04 08:16:23.000000000 +0200
+++ mplayer-export-2008-09-03/libvo/x11_common.c 2008-11-23 21:39:27.000000000 +0100
@@ -1250,7 +1250,7 @@ Window vo_x11_create_smooth_window(Displ
unsigned int width, unsigned int height,
int depth, Colormap col_map)
{
- unsigned long xswamask = CWBackingStore | CWBorderPixel;
+ unsigned long xswamask = CWBorderPixel;
XSetWindowAttributes xswa;
Window ret_win;
@@ -1261,7 +1261,7 @@ Window vo_x11_create_smooth_window(Displ
}
xswa.background_pixel = 0;
xswa.border_pixel = 0;
- xswa.backing_store = Always;
+ xswa.backing_store = NotUseful;
xswa.bit_gravity = StaticGravity;
ret_win =
mplayer-dvb.patch:
--- NEW FILE mplayer-dvb.patch ---
diff -up mplayer-export-2008-09-03/stream/dvb_tune.c.dvb mplayer-export-2008-09-03/stream/dvb_tune.c
--- mplayer-export-2008-09-03/stream/dvb_tune.c.dvb 2008-08-14 17:54:53.000000000 +0200
+++ mplayer-export-2008-09-03/stream/dvb_tune.c 2008-11-23 21:33:29.000000000 +0100
@@ -114,9 +114,7 @@ int dvb_open_devices(dvb_priv_t *priv, i
mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno);
return 0;
}
-#ifdef CONFIG_DVB_HEAD
- priv->sec_fd=0;
-#else
+#ifndef CONFIG_DVB_HEAD
priv->sec_fd = open(sec_dev, O_RDWR);
if(priv->sec_fd < 0)
{
diff -up mplayer-export-2008-09-03/stream/stream_dvb.c.dvb mplayer-export-2008-09-03/stream/stream_dvb.c
--- mplayer-export-2008-09-03/stream/stream_dvb.c.dvb 2008-08-14 17:54:53.000000000 +0200
+++ mplayer-export-2008-09-03/stream/stream_dvb.c 2008-11-23 21:33:29.000000000 +0100
@@ -611,9 +611,10 @@ static void dvbin_close(stream_t *stream
close(priv->dvr_fd);
close(priv->fe_fd);
-#ifdef CONFIG_DVB
+#ifndef CONFIG_DVB_HEAD
close(priv->sec_fd);
#endif
+ priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
priv->is_on = 0;
dvb_free_config(priv->config);
@@ -685,6 +686,7 @@ static int dvb_open(stream_t *stream, in
return STREAM_ERROR;
priv = (dvb_priv_t *)stream->priv;
+ priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1;
priv->config = dvb_get_config();
if(priv->config == NULL)
{
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mplayer.spec 28 Oct 2008 22:27:25 -0000 1.8
+++ mplayer.spec 24 Nov 2008 23:16:03 -0000 1.9
@@ -27,6 +27,10 @@
Patch12: %{name}-man-zh_CN.patch
Patch13: %{name}-CVE-2008-3827.patch
Patch14: %{name}-nodvdcss.patch
+# SVN r27892, r27893, r27897
+Patch15: %{name}-dvb.patch
+# SVN r27849
+Patch16: %{name}-backing-store.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -59,7 +63,6 @@
BuildRequires: libdvdnav-devel >= 4.1.3-0.4
BuildRequires: libjpeg-devel
BuildRequires: libmpcdec-devel
-BuildRequires: libsmbclient-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: lirc-devel
@@ -78,6 +81,7 @@
%{?_with_libmad:BuildRequires: libmad-devel}
%{?_with_nemesi:BuildRequires: libnemesi-devel >= 0.6.3}
%{?_with_openal:BuildRequires: openal-devel}
+%{?_with_samba:BuildRequires: libsmbclient-devel}
%{?_with_svgalib:BuildRequires: svgalib-devel}
%{?_with_xmms:BuildRequires: xmms-devel}
%if %{svn}
@@ -99,6 +103,7 @@
OpenGL, SVGAlib, fbdev, AAlib, DirectFB etc. There are also nice
antialiased shaded subtitles and OSD.
Non-default rpmbuild options:
+--with samba: Enable Samba (smb://) support
--with xmms: Enable XMMS input plugin support
--with amr: Enable AMR support
--with libmad: Enable libmad support
@@ -114,6 +119,7 @@
Summary: GUI for MPlayer
Group: Applications/Multimedia
Requires: mplayer = %{version}-%{release}
+Requires: hicolor-icon-theme
%description gui
This package contains a GUI for MPlayer and a default skin for it.
@@ -122,8 +128,6 @@
Summary: MPlayer movie encoder
Group: Applications/Multimedia
Requires: mplayer = %{version}-%{release}
-Provides: mplayer-mencoder = %{version}-%{release}
-Obsoletes: mplayer-mencoder < 1.0-0.36
%description -n mencoder
This package contains the MPlayer movie encoder.
@@ -158,6 +162,7 @@
--disable-dvdread-internal \\\
--disable-libdvdcss-internal \\\
%{!?_with_nemesi:--disable-nemesi} \\\
+ %{!?_with_samba:--disable-smb} \\\
\\\
--disable-faac-lavc \\\
--disable-mp3lame-lavc \\\
@@ -197,6 +202,8 @@
%patch12 -p1 -b .man-zh_CN
%patch13 -p0 -b .cve
%patch14 -p1 -b .nodvdcss
+%patch15 -p1 -b .dvb
+%patch16 -p1 -b .bs
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -347,6 +354,13 @@
%changelog
+* Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.103.20080903svn
+- fix broken terminal after using dvb input (bug #117)
+- disable backing store (fixes tearing on Xorg Xserver 1.5.x)
+- disable samba support by default, too much dependency bloat (bug #147)
+- add missing Requires for hicolor icon dirs to -gui
+- drop provides and obsoletes for mplayer-mencoder (last seen for FC4)
+
* Tue Oct 28 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.102.20080903svn
- rework the build system
- rebuild for new libcaca
16 years, 1 month
rpms/fglrx-kmod/EL-5 fglrx-kmod.spec,1.13,1.14
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/fglrx-kmod/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30917
Modified Files:
fglrx-kmod.spec
Log Message:
same for the spec file
Index: fglrx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/EL-5/fglrx-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fglrx-kmod.spec 22 Nov 2008 13:47:32 -0000 1.13
+++ fglrx-kmod.spec 24 Nov 2008 21:24:05 -0000 1.14
@@ -14,7 +14,7 @@
%endif
Name: fglrx-kmod
-Version: 8.552
+Version: 8.542
Release: 1.%{ativersion}%{?dist}.3
# Taken over by kmodtool
Summary: AMD display driver kernel module
16 years, 1 month
rpms/fglrx-kmod/EL-5 sources,1.3,1.4
by Xavier Lamien
Author: laxathom
Update of /cvs/nonfree/rpms/fglrx-kmod/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30628
Modified Files:
sources
Log Message:
downgrade to 8.542 wich work properly
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/fglrx-kmod/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 17 Nov 2008 17:29:30 -0000 1.3
+++ sources 24 Nov 2008 21:20:46 -0000 1.4
@@ -1 +1 @@
-767aa42b251e1dd74539fb3b3dda3a7f fglrx-kmod-data-8.552.tar.bz2
+5093c58b1d9d14e4e4ca3117a7fec810 fglrx-kmod-data-8.542.tar.bz2
16 years, 1 month
rpms/gnome-mplayer/F-8 gnome-mplayer.spec,1.13,1.14
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gnome-mplayer/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12288
Modified Files:
gnome-mplayer.spec
Log Message:
s/libcurl-devel/curl-devel
Index: gnome-mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-mplayer/F-8/gnome-mplayer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-mplayer.spec 24 Nov 2008 15:08:53 -0000 1.13
+++ gnome-mplayer.spec 24 Nov 2008 15:37:45 -0000 1.14
@@ -15,7 +15,7 @@
BuildRequires: GConf2-devel
BuildRequires: gettext
BuildRequires: gtk2-devel
-BuildRequires: libcurl-devel
+BuildRequires: curl-devel
BuildRequires: libgpod-devel
BuildRequires: libmusicbrainz3-devel
BuildRequires: libnotify-devel
16 years, 1 month
rpms/gecko-mediaplayer/F-8 gecko-mediaplayer.spec,1.7,1.8
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10518
Modified Files:
gecko-mediaplayer.spec
Log Message:
* Mon Nov 24 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.2-2
- s/gnome-mplayer-core-functionality/gnome-mplayer-binary
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-8/gecko-mediaplayer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gecko-mediaplayer.spec 22 Nov 2008 08:55:57 -0000 1.7
+++ gecko-mediaplayer.spec 24 Nov 2008 15:10:30 -0000 1.8
@@ -1,6 +1,6 @@
Name: gecko-mediaplayer
Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Gnome MPlayer browser plugin
Group: Applications/Multimedia
@@ -16,7 +16,7 @@
BuildRequires: gecko-devel
Requires: %{_libdir}/mozilla/plugins
-Requires: gnome-mplayer-core-functionality >= %{version}
+Requires: gnome-mplayer-binary >= %{version}
Requires(pre): GConf2
Requires(post): GConf2
@@ -95,6 +95,9 @@
%changelog
+* Mon Nov 24 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.2-2
+- s/gnome-mplayer-core-functionality/gnome-mplayer-binary
+
* Sat Nov 22 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.2-1
- Updated to 0.9.2
- Require gnome-mplayer-core-functionality instead of gnome-mplayer
16 years, 1 month
