rpms/yapeSDL/F-10 Plus4.png, NONE, 1.1 yapeSDL-0.32.5-cflags.patch, NONE, 1.1 yapeSDL-0.32.5-homedir.patch, NONE, 1.1 yapeSDL.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yapeSDL.spec, 1.1, 1.2 yapeSDL-0.32.4-gcc4_cflags.patch, 1.1, NONE yapeSDL-0.32.4-homedir.patch, 1.1, NONE yapeSDL-0.32.4-loadfile.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/yapeSDL/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29595
Modified Files:
.cvsignore sources yapeSDL.spec
Added Files:
Plus4.png yapeSDL-0.32.5-cflags.patch
yapeSDL-0.32.5-homedir.patch yapeSDL.desktop
Removed Files:
yapeSDL-0.32.4-gcc4_cflags.patch yapeSDL-0.32.4-homedir.patch
yapeSDL-0.32.4-loadfile.patch
Log Message:
* Wed Dec 03 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.32.5-1
- Updated to upstream 0.32.5
- Version 0.32.5 ships a small GUI - added a desktop entry and an icon
- Removed the name from the summary
yapeSDL-0.32.5-cflags.patch:
--- NEW FILE yapeSDL-0.32.5-cflags.patch ---
--- Makefile.orig 2008-12-01 12:15:43.000000000 +0100
+++ Makefile 2008-12-01 12:16:38.000000000 +0100
@@ -24,7 +24,7 @@
sourcefiles = $(filter-out $(hasnoheader),$(allfiles)) device.h mem.h roms.h types.h
CC = g++
-cflags = -O3 -finline -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags`
+cflags = $(RPM_OPT_FLAGS) -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags`
libs = `sdl-config --libs`
#SDL_CFLAGS := $(shell sdl-config --cflags)
yapeSDL-0.32.5-homedir.patch:
--- NEW FILE yapeSDL-0.32.5-homedir.patch ---
--- archdep.cpp.orig 2008-12-01 12:19:01.000000000 +0100
+++ archdep.cpp 2008-12-01 12:19:50.000000000 +0100
@@ -75,7 +75,7 @@
int ad_makedirs(char *path)
{
strcpy(temp,path);
- strcat(temp, "/yape");
+ strcat(temp, "/.yape");
CreateDirectory(temp, NULL);
return 1;
@@ -296,7 +296,7 @@
// Possible buffer overflow fixed.
strncpy(temp, path, 512);
if (strlen(temp) > 506) return 0;
- strcat(temp, "/yape");
+ strcat(temp, "/.yape");
mkdir(temp, 0777);
return 1;
@@ -307,7 +307,7 @@
// Possible buffer overflow fixed.
strncpy(temp, tmpchr, 512);
if (strlen(temp) > 496) return NULL;
- strcat( temp, "/yape/yape.conf");
+ strcat( temp, "/.yape/yape.conf");
return temp;
}
--- README.SDL.orig 2008-12-01 12:19:59.000000000 +0100
+++ README.SDL 2008-12-01 12:20:34.000000000 +0100
@@ -80,7 +80,7 @@
LALT + W : toggle between unlimited speed and 50 Hz frame rate (original speed)
Internal disk LOAD/SAVE operations are supported to the current
- file system directory, which is usually '/home/<username>/yape'.
+ file system directory, which is usually '/home/<username>/.yape'.
Any PRG files you may wish to load, should go there, although you can browse the directory tree
from the user interface, too.
--- NEW FILE yapeSDL.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=YapeSDL
Comment=Yet another plus/4 emulator
Exec=yape
Icon=yapeSDL
Terminal=false
Type=Application
Categories=Game;Emulator;
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/yapeSDL/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 26 Jul 2008 14:18:00 -0000 1.2
+++ .cvsignore 3 Dec 2008 14:16:20 -0000 1.3
@@ -1 +1 @@
-yapeSDL-0.32.4.tar.gz
+yapeSDL-0.32.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/yapeSDL/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 26 Jul 2008 14:18:00 -0000 1.2
+++ sources 3 Dec 2008 14:16:20 -0000 1.3
@@ -1 +1 @@
-b2b7a180d2c7893805f820f80f59ad30 yapeSDL-0.32.4.tar.gz
+2d37d720975dc6a0fd9ec4e7964cafb1 yapeSDL-0.32.5.tar.gz
Index: yapeSDL.spec
===================================================================
RCS file: /cvs/nonfree/rpms/yapeSDL/F-10/yapeSDL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yapeSDL.spec 26 Jul 2008 14:18:00 -0000 1.1
+++ yapeSDL.spec 3 Dec 2008 14:16:20 -0000 1.2
@@ -1,21 +1,28 @@
Name: yapeSDL
-Version: 0.32.4
-Release: 2%{?dist}
-Summary: YAPE, yet another plus/4 emulator
+Version: 0.32.5
+Release: 1%{?dist}
+Summary: Yet another plus/4 emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://yape.plus4.net/
Source: http://yape.homeserver.hu/download/%{name}-%{version}.tar.gz
-# OpenSUSE
-Patch0: %{name}-0.32.4-gcc4_cflags.patch
-# FreeBSD
-Patch1: %{name}-0.32.4-homedir.patch
+Source1: %{name}.desktop
+# Icon taken from
+# http://ahlberg.deviantart.com/art/Commodore-Icons-70563314
+# License:
+# These icons are FREE! Feel free to use them in your applications,
+# on your site, signature on a forum or whatever.
+Source2: Plus4.png
# Andrea Musuruane
-Patch2: %{name}-0.32.4-loadfile.patch
+Patch0: %{name}-0.32.5-cflags.patch
+Patch1: %{name}-0.32.5-homedir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel >= 0:1.2
+BuildRequires: desktop-file-utils
+Requires: hicolor-icon-theme
+
%description
YAPE is a rather decent plus/4 emulator. It has been developed for
@@ -26,18 +33,17 @@
%prep
%setup -q -c -n %{name}-%{version}
%patch0 -p0
-%patch1 -p1
-%patch2 -p1
+%patch1 -p0
# Fix end-of-line-encoding
-sed -i 's/\r//' *.{cpp,h} Changes README.SDL copying
+sed -i 's/\r//' *.{cpp,h} Changes README.SDL COPYING
# Fix UTF-8 encoding
iconv --from=ISO-8859-1 --to=UTF-8 README.SDL > README.SDL.utf8
mv README.SDL.utf8 README.SDL
# Fix spurious executable permissions
-chmod 644 *.{cpp,h} Changes README.SDL copying
+chmod 644 *.{cpp,h} Changes README.SDL COPYING
%build
@@ -49,6 +55,30 @@
install -d -m 0755 %{buildroot}%{_bindir}
install -m 0755 yape %{buildroot}%{_bindir}/
+# install desktop file
+mkdir -p %{buildroot}%{_datadir}/applications
+desktop-file-install --vendor '' \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE1}
+
+# install icon
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+cp %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
%clean
rm -rf %{buildroot}
@@ -56,11 +86,17 @@
%files
%defattr(-,root,root,-)
-%doc Changes copying README.SDL
-%defattr(-,root,root,0755)
%{_bindir}/yape
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%doc Changes COPYING README.SDL
%changelog
+* Wed Dec 03 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.32.5-1
+- Updated to upstream 0.32.5
+- Version 0.32.5 ships a small GUI - added a desktop entry and an icon
+- Removed the name from the summary
+
* Tue Feb 26 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.32.4-2
- Minor cleanup
--- yapeSDL-0.32.4-gcc4_cflags.patch DELETED ---
--- yapeSDL-0.32.4-homedir.patch DELETED ---
--- yapeSDL-0.32.4-loadfile.patch DELETED ---
15 years, 11 months
rpms/yapeSDL/devel Plus4.png, NONE, 1.1 yapeSDL-0.32.5-cflags.patch, NONE, 1.1 yapeSDL-0.32.5-homedir.patch, NONE, 1.1 yapeSDL.desktop, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 yapeSDL.spec, 1.1, 1.2 yapeSDL-0.32.4-gcc4_cflags.patch, 1.1, NONE yapeSDL-0.32.4-homedir.patch, 1.1, NONE yapeSDL-0.32.4-loadfile.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/yapeSDL/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28484
Modified Files:
.cvsignore sources yapeSDL.spec
Added Files:
Plus4.png yapeSDL-0.32.5-cflags.patch
yapeSDL-0.32.5-homedir.patch yapeSDL.desktop
Removed Files:
yapeSDL-0.32.4-gcc4_cflags.patch yapeSDL-0.32.4-homedir.patch
yapeSDL-0.32.4-loadfile.patch
Log Message:
* Wed Dec 03 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.32.5-1
- Updated to upstream 0.32.5
- Version 0.32.5 ships a small GUI - added a desktop entry and an icon
- Removed the name from the summary
yapeSDL-0.32.5-cflags.patch:
--- NEW FILE yapeSDL-0.32.5-cflags.patch ---
--- Makefile.orig 2008-12-01 12:15:43.000000000 +0100
+++ Makefile 2008-12-01 12:16:38.000000000 +0100
@@ -24,7 +24,7 @@
sourcefiles = $(filter-out $(hasnoheader),$(allfiles)) device.h mem.h roms.h types.h
CC = g++
-cflags = -O3 -finline -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags`
+cflags = $(RPM_OPT_FLAGS) -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags`
libs = `sdl-config --libs`
#SDL_CFLAGS := $(shell sdl-config --cflags)
yapeSDL-0.32.5-homedir.patch:
--- NEW FILE yapeSDL-0.32.5-homedir.patch ---
--- archdep.cpp.orig 2008-12-01 12:19:01.000000000 +0100
+++ archdep.cpp 2008-12-01 12:19:50.000000000 +0100
@@ -75,7 +75,7 @@
int ad_makedirs(char *path)
{
strcpy(temp,path);
- strcat(temp, "/yape");
+ strcat(temp, "/.yape");
CreateDirectory(temp, NULL);
return 1;
@@ -296,7 +296,7 @@
// Possible buffer overflow fixed.
strncpy(temp, path, 512);
if (strlen(temp) > 506) return 0;
- strcat(temp, "/yape");
+ strcat(temp, "/.yape");
mkdir(temp, 0777);
return 1;
@@ -307,7 +307,7 @@
// Possible buffer overflow fixed.
strncpy(temp, tmpchr, 512);
if (strlen(temp) > 496) return NULL;
- strcat( temp, "/yape/yape.conf");
+ strcat( temp, "/.yape/yape.conf");
return temp;
}
--- README.SDL.orig 2008-12-01 12:19:59.000000000 +0100
+++ README.SDL 2008-12-01 12:20:34.000000000 +0100
@@ -80,7 +80,7 @@
LALT + W : toggle between unlimited speed and 50 Hz frame rate (original speed)
Internal disk LOAD/SAVE operations are supported to the current
- file system directory, which is usually '/home/<username>/yape'.
+ file system directory, which is usually '/home/<username>/.yape'.
Any PRG files you may wish to load, should go there, although you can browse the directory tree
from the user interface, too.
--- NEW FILE yapeSDL.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=YapeSDL
Comment=Yet another plus/4 emulator
Exec=yape
Icon=yapeSDL
Terminal=false
Type=Application
Categories=Game;Emulator;
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/yapeSDL/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 26 Jul 2008 14:18:00 -0000 1.2
+++ .cvsignore 3 Dec 2008 14:02:20 -0000 1.3
@@ -1 +1 @@
-yapeSDL-0.32.4.tar.gz
+yapeSDL-0.32.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/yapeSDL/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 26 Jul 2008 14:18:00 -0000 1.2
+++ sources 3 Dec 2008 14:02:20 -0000 1.3
@@ -1 +1 @@
-b2b7a180d2c7893805f820f80f59ad30 yapeSDL-0.32.4.tar.gz
+2d37d720975dc6a0fd9ec4e7964cafb1 yapeSDL-0.32.5.tar.gz
Index: yapeSDL.spec
===================================================================
RCS file: /cvs/nonfree/rpms/yapeSDL/devel/yapeSDL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yapeSDL.spec 26 Jul 2008 14:18:00 -0000 1.1
+++ yapeSDL.spec 3 Dec 2008 14:02:20 -0000 1.2
@@ -1,21 +1,28 @@
Name: yapeSDL
-Version: 0.32.4
-Release: 2%{?dist}
-Summary: YAPE, yet another plus/4 emulator
+Version: 0.32.5
+Release: 1%{?dist}
+Summary: Yet another plus/4 emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://yape.plus4.net/
Source: http://yape.homeserver.hu/download/%{name}-%{version}.tar.gz
-# OpenSUSE
-Patch0: %{name}-0.32.4-gcc4_cflags.patch
-# FreeBSD
-Patch1: %{name}-0.32.4-homedir.patch
+Source1: %{name}.desktop
+# Icon taken from
+# http://ahlberg.deviantart.com/art/Commodore-Icons-70563314
+# License:
+# These icons are FREE! Feel free to use them in your applications,
+# on your site, signature on a forum or whatever.
+Source2: Plus4.png
# Andrea Musuruane
-Patch2: %{name}-0.32.4-loadfile.patch
+Patch0: %{name}-0.32.5-cflags.patch
+Patch1: %{name}-0.32.5-homedir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel >= 0:1.2
+BuildRequires: desktop-file-utils
+Requires: hicolor-icon-theme
+
%description
YAPE is a rather decent plus/4 emulator. It has been developed for
@@ -26,18 +33,17 @@
%prep
%setup -q -c -n %{name}-%{version}
%patch0 -p0
-%patch1 -p1
-%patch2 -p1
+%patch1 -p0
# Fix end-of-line-encoding
-sed -i 's/\r//' *.{cpp,h} Changes README.SDL copying
+sed -i 's/\r//' *.{cpp,h} Changes README.SDL COPYING
# Fix UTF-8 encoding
iconv --from=ISO-8859-1 --to=UTF-8 README.SDL > README.SDL.utf8
mv README.SDL.utf8 README.SDL
# Fix spurious executable permissions
-chmod 644 *.{cpp,h} Changes README.SDL copying
+chmod 644 *.{cpp,h} Changes README.SDL COPYING
%build
@@ -49,6 +55,30 @@
install -d -m 0755 %{buildroot}%{_bindir}
install -m 0755 yape %{buildroot}%{_bindir}/
+# install desktop file
+mkdir -p %{buildroot}%{_datadir}/applications
+desktop-file-install --vendor '' \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE1}
+
+# install icon
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+cp %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
%clean
rm -rf %{buildroot}
@@ -56,11 +86,17 @@
%files
%defattr(-,root,root,-)
-%doc Changes copying README.SDL
-%defattr(-,root,root,0755)
%{_bindir}/yape
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%doc Changes COPYING README.SDL
%changelog
+* Wed Dec 03 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.32.5-1
+- Updated to upstream 0.32.5
+- Version 0.32.5 ships a small GUI - added a desktop entry and an icon
+- Removed the name from the summary
+
* Tue Feb 26 2008 Andrea Musuruane <musuruan(a)gmail.com> 0.32.4-2
- Minor cleanup
--- yapeSDL-0.32.4-gcc4_cflags.patch DELETED ---
--- yapeSDL-0.32.4-homedir.patch DELETED ---
--- yapeSDL-0.32.4-loadfile.patch DELETED ---
15 years, 11 months
rpms/smc/devel smc.spec,1.3,1.4
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/smc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25442
Modified Files:
smc.spec
Log Message:
* Wed Dec 3 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-4
- Rebuild for new cegui
Index: smc.spec
===================================================================
RCS file: /cvs/free/rpms/smc/devel/smc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smc.spec 15 Sep 2008 12:44:43 -0000 1.3
+++ smc.spec 3 Dec 2008 13:12:59 -0000 1.4
@@ -1,6 +1,6 @@
Name: smc
Version: 1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: 2D platform game that uses OpenGL in a style similar to Super Mario
Group: Amusements/Games
License: GPLv3
@@ -113,6 +113,9 @@
%changelog
+* Wed Dec 3 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-4
+- Rebuild for new cegui
+
* Mon Sep 15 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.5-3
- Rebuild for rawhide boost DOWNGRADE to 1.34 <GRRR>
15 years, 11 months
rpms/x264/devel x264-rpm.patch,1.3,1.4
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17574
Modified Files:
x264-rpm.patch
Log Message:
ppc fix, try 1
x264-rpm.patch:
Index: x264-rpm.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-rpm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x264-rpm.patch 2 Dec 2008 23:33:45 -0000 1.3
+++ x264-rpm.patch 3 Dec 2008 00:23:13 -0000 1.4
@@ -1,6 +1,6 @@
diff -up x264-20081202/configure.r x264-20081202/configure
--- x264-20081202/configure.r 2008-12-02 23:26:25.000000000 +0100
-+++ x264-20081202/configure 2008-12-03 00:19:58.000000000 +0100
++++ x264-20081202/configure 2008-12-03 01:19:48.000000000 +0100
@@ -41,7 +41,7 @@ as_check() {
return $TMP
}
@@ -41,8 +41,16 @@
cat > x264.pc << EOF
diff -up x264-20081202/Makefile.r x264-20081202/Makefile
--- x264-20081202/Makefile.r 2008-12-02 23:26:25.000000000 +0100
-+++ x264-20081202/Makefile 2008-12-03 00:21:09.000000000 +0100
-@@ -77,14 +77,25 @@ libx264.a: .depend $(OBJS) $(OBJASM)
++++ x264-20081202/Makefile 2008-12-03 01:21:24.000000000 +0100
+@@ -53,6 +53,7 @@ ALTIVECSRC += common/ppc/mc.c common/ppc
+ common/ppc/predict.c
+ SRCS += $(ALTIVECSRC)
+ $(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS)
++common/ppc/pixel.c: CFLAGS += -flax-vector-conversions
+ endif
+
+ # VIS optims
+@@ -77,14 +78,25 @@ libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
ranlib libx264.a
@@ -68,7 +76,7 @@
%.o: %.asm
$(AS) $(ASFLAGS) -o $@ $<
-@@ -148,10 +159,12 @@ install: x264$(EXE) $(SONAME)
+@@ -148,10 +160,12 @@ install: x264$(EXE) $(SONAME)
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
install -m 644 x264.h $(DESTDIR)$(includedir)
15 years, 11 months
rpms/xvidcore/devel xvidcore-rpm.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xvidcore.spec, 1.1, 1.2 xvidcore-noexecstack.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/xvidcore/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16314
Modified Files:
.cvsignore sources xvidcore.spec
Added Files:
xvidcore-rpm.patch
Removed Files:
xvidcore-noexecstack.patch
Log Message:
* Wed Dec 03 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.0-1
- 1.2.0
- drop upstreamed noexec stack patch
- BR recent nasm instead of yasm
- licence seems to be just GPLv2+
- move TODO from main to -devel doc
- update summary and description
- small spec file fixes
xvidcore-rpm.patch:
--- NEW FILE xvidcore-rpm.patch ---
diff -up xvidcore/src/xvid.c.r xvidcore/src/xvid.c
--- xvidcore/src/xvid.c.r 2008-11-30 17:38:31.000000000 +0100
+++ xvidcore/src/xvid.c 2008-12-03 00:47:15.000000000 +0100
@@ -27,6 +27,9 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
#include "xvid.h"
#include "decoder.h"
@@ -675,7 +678,6 @@ xvid_gbl_info(xvid_gbl_info_t * info)
#else
- #include <unistd.h>
info->num_threads = sysconf(_SC_NPROCESSORS_CONF);
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xvidcore/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 15:23:52 -0000 1.2
+++ .cvsignore 3 Dec 2008 00:04:05 -0000 1.3
@@ -1 +1 @@
-xvidcore-1.1.3.tar.bz2
+xvidcore-1.2.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xvidcore/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 15:23:52 -0000 1.2
+++ sources 3 Dec 2008 00:04:05 -0000 1.3
@@ -1 +1 @@
-29c60d4d991ac18f687a8fd13cfe64b7 xvidcore-1.1.3.tar.bz2
+07c31ebf7d4e7aa6fcd17e8e4a0d1aca xvidcore-1.2.0.tar.bz2
Index: xvidcore.spec
===================================================================
RCS file: /cvs/free/rpms/xvidcore/devel/xvidcore.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xvidcore.spec 3 Aug 2008 15:23:52 -0000 1.1
+++ xvidcore.spec 3 Dec 2008 00:04:05 -0000 1.2
@@ -1,38 +1,43 @@
Name: xvidcore
-Version: 1.1.3
-Release: 4%{?dist}
-Summary: Free reimplementation of the OpenDivX video codec
+Version: 1.2.0
+Release: 1%{?dist}
+Summary: MPEG-4 Simple and Advanced Simple Profile codec
Group: System Environment/Libraries
-License: XVID (GPL with specific restrictions)
+License: GPLv2+
URL: http://www.xvid.org/
Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
-Patch0: %{name}-noexecstack.patch
+Patch0: %{name}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch %{ix86} x86_64
-BuildRequires: yasm
+BuildRequires: nasm >= 2.0
%endif
%description
-Free reimplementation of the OpenDivX video codec. You can play OpenDivX
-and DivX4 videos with it, as well as encode compatible files.
+The Xvid video codec implements MPEG-4 Simple Profile and Advanced Simple
+Profile standards. It permits compressing and decompressing digital video
+in order to reduce the required bandwidth of video data for transmission
+over computer networks or efficient storage on CDs or DVDs. Due to its
+unrivalled quality Xvid has gained great popularity and is used in many
+other GPLed applications, like e.g. Transcode, MEncoder, MPlayer, Xine and
+many more.
%package devel
-Summary: Development files for the XviD video codec
+Summary: Development files for the Xvid video codec
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
This package contains header files, static library and API
-documentation for the XviD video codec.
+documentation for the Xvid video codec.
%prep
-%setup -q
-%patch0 -p1 -b .noexec
+%setup -q -n %{name}
+%patch0 -p1 -b .r
chmod -x examples/*.pl
-f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
+f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && touch -r $f $f.utf8 && mv $f.utf8 $f
# Yes, we want to see the build output.
%{__perl} -pi -e 's/^\t@(?!echo\b)/\t/' build/generic/Makefile
@@ -48,7 +53,7 @@
%install
rm -rf $RPM_BUILD_ROOT
make -C build/generic install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a
+rm $RPM_BUILD_ROOT%{_libdir}/libxvidcore.a
cd $RPM_BUILD_ROOT%{_libdir}
chmod 755 libxvidcore.so*
/sbin/ldconfig -n .
@@ -67,17 +72,26 @@
%files
%defattr(-,root,root,-)
-%doc LICENSE README AUTHORS ChangeLog TODO
+%doc LICENSE README AUTHORS ChangeLog
%{_libdir}/libxvidcore.so.*
%files devel
%defattr(-,root,root,-)
-%doc CodingStyle examples/
+%doc CodingStyle TODO examples/
%{_includedir}/xvid.h
%{_libdir}/libxvidcore.so
%changelog
+* Wed Dec 03 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.0-1
+- 1.2.0
+- drop upstreamed noexec stack patch
+- BR recent nasm instead of yasm
+- licence seems to be just GPLv2+
+- move TODO from main to -devel doc
+- update summary and description
+- small spec file fixes
+
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.1.3-4
- rebuild
--- xvidcore-noexecstack.patch DELETED ---
15 years, 11 months
rpms/x264/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 x264-rpm.patch, 1.2, 1.3 x264.spec, 1.4, 1.5 x264.desktop, 1.2, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14635
Modified Files:
.cvsignore sources x264-rpm.patch x264.spec
Removed Files:
x264.desktop
Log Message:
* Tue Dec 02 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.19.20081202git71d34b4
- 20081202 snapshot
- bring back asm optimized/unoptimized libs split
- rebase and improve patch
- GUI dropped upstream
- dropped redundant BRs
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 5 Sep 2008 10:20:21 -0000 1.3
+++ .cvsignore 2 Dec 2008 23:33:44 -0000 1.4
@@ -1 +1 @@
-x264-20080905.tar.bz2
+x264-20081202.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 5 Sep 2008 10:20:21 -0000 1.3
+++ sources 2 Dec 2008 23:33:45 -0000 1.4
@@ -1 +1 @@
-09795824d0c28bf221ba96ebeb971ed2 x264-20080905.tar.bz2
+e4e52e3a3c03e23934bf2ed656fcf26e x264-20081202.tar.bz2
x264-rpm.patch:
Index: x264-rpm.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-rpm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x264-rpm.patch 5 Sep 2008 10:20:21 -0000 1.2
+++ x264-rpm.patch 2 Dec 2008 23:33:45 -0000 1.3
@@ -1,165 +1,84 @@
-diff -up x264-20080905/configure.r x264-20080905/configure
---- x264-20080905/configure.r 2008-09-05 11:30:52.000000000 +0200
-+++ x264-20080905/configure 2008-09-05 11:43:27.000000000 +0200
-@@ -158,7 +158,7 @@ for opt do
- shared="yes"
- ;;
- --enable-visualize)
-- LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
-+ LDFLAGS="$LDFLAGS -lX11"
- CFLAGS="$CFLAGS -DVISUALIZE=1"
- vis="yes"
- ;;
-@@ -243,6 +243,7 @@ esac
- case $host_cpu in
+diff -up x264-20081202/configure.r x264-20081202/configure
+--- x264-20081202/configure.r 2008-12-02 23:26:25.000000000 +0100
++++ x264-20081202/configure 2008-12-03 00:19:58.000000000 +0100
+@@ -41,7 +41,7 @@ as_check() {
+ return $TMP
+ }
+
+-rm -f config.h config.mak x264.pc conftest*
++rm -f config.mak x264.pc conftest*
+
+ prefix='/usr/local'
+ exec_prefix='${prefix}'
+@@ -239,6 +239,7 @@ case $host_cpu in
i*86)
ARCH="X86"
-+ LDFLAGS="$LDFLAGS -m32"
- AS="yasm"
ASFLAGS="-O2"
++ LDFLAGS="$LDFLAGS -m32"
if [ "$SYS" = MACOSX ]; then
-@@ -363,7 +364,7 @@ if test "$pthread" = "yes" ; then
+ ASFLAGS="$ASFLAGS -f macho -DPREFIX"
+ elif [ "$SYS" = MINGW ]; then
+@@ -352,7 +353,11 @@ if test "$pthread" = "yes" ; then
LDFLAGS="$LDFLAGS $libpthread"
fi
--MP4_LDFLAGS="-lgpac_static"
++if [ "$shared" = "yes" ]; then
+MP4_LDFLAGS="-lgpac"
++else
+ MP4_LDFLAGS="-lgpac_static"
++fi
if [ $SYS = MINGW ]; then
MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
fi
-@@ -478,7 +479,6 @@ if [ "$shared" = "yes" ]; then
+@@ -452,8 +457,6 @@ if [ "$shared" = "yes" ]; then
+ echo 'default: $(SONAME)' >> config.mak
fi
- if [ "$gtk" = "yes" ]; then
-- echo 'default: libx264gtk.a' >> config.mak
- echo 'install: install-gtk' >> config.mak
- fi
-
-diff -up x264-20080905/gtk/Makefile.r x264-20080905/gtk/Makefile
---- x264-20080905/gtk/Makefile.r 2008-09-05 11:30:52.000000000 +0200
-+++ x264-20080905/gtk/Makefile 2008-09-05 11:41:36.000000000 +0200
-@@ -46,14 +46,14 @@ SOURCES_ALL = $(OBJECTS_ALL:%.o=%.c)
-
- X264GTK_PC = x264gtk.pc
-
--EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
-+EXTERNAL_DEPS= ../muxers.o ../matroska.o $(SONAME)
-
-
- all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
-
- # Already provides iconv/intl
- CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
--LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
-+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` -L.. -lx264
-
-
- # gettext rules
-@@ -86,11 +86,6 @@ x264_icon.h: x264.ico
-
-
- # Linking rule
--libx264gtk.a: $(OBJECTS_LIB)
-- @echo " L: $(@F)"
-- @ar rc libx264gtk.a $(OBJECTS_LIB)
-- @ranlib libx264gtk.a
+-./version.sh
-
- $(SONAMEGTK): $(OBJECTS_LIB)
- @echo " L: $(@F)"
- @$(CC) -shared -o $@ $(OBJECTS_LIB) $(SOFLAGS) $(LDFLAGS)
-@@ -102,7 +97,7 @@ $(TEST_BIN): $(OBJECTS_LIB) $(OBJECTS_TE
- @$(CC) -o $(TEST_BIN) $(OBJECTS_LIB) $(OBJECTS_TEST) $(LDFLAGS) $(ICONV_LIB)
-
- # Program : x264_gtk_encode
--$(ENCODE_BIN): x264_icon.h libx264gtk.a $(SONAMEGTK) $(OBJECTS_ENCODE) $(EXTERNAL_DEPS) $(X264GTK_O)
-+$(ENCODE_BIN): x264_icon.h $(SONAMEGTK) $(OBJECTS_ENCODE) $(EXTERNAL_DEPS) $(X264GTK_O)
- @echo " B: $(@F)"
- @$(CC) -o $(ENCODE_BIN) $(OBJECTS_LIB) $(OBJECTS_ENCODE) $(EXTERNAL_DEPS) $(LDFLAGS) $(X264GTK_O)
-
-@@ -110,17 +105,17 @@ $(ENCODE_BIN): x264_icon.h libx264gtk.a
- $(X264GTK_PC):
- @echo " S: $(X264GTK_PC)"
- @rm -f $(X264GTK_PC)
-- @echo "prefix=$(DESTDIR)${prefix}" > $(X264GTK_PC)
-- @echo "exec_prefix=$(DESTDIR)${exec_prefix}" >> $(X264GTK_PC)
-- @echo "libdir=$(DESTDIR)${libdir}" >> $(X264GTK_PC)
-- @echo "includedir=$(DESTDIR)${includedir}" >> $(X264GTK_PC)
-+ @echo "prefix=${prefix}" > $(X264GTK_PC)
-+ @echo "exec_prefix=${exec_prefix}" >> $(X264GTK_PC)
-+ @echo "libdir=${libdir}" >> $(X264GTK_PC)
-+ @echo "includedir=${includedir}" >> $(X264GTK_PC)
- @echo "" >> $(X264GTK_PC)
- @echo "Name: Gtk+ interface for X264" >> $(X264GTK_PC)
- @echo "Description: Gtk+ interface to configure X264" >> $(X264GTK_PC)
- @echo "Requires: x264" >> $(X264GTK_PC)
- @echo "Version: 0.1" >> $(X264GTK_PC)
-- @echo "Libs: -L$(DESTDIR)$(libdir) -lx264gtk" >> $(X264GTK_PC)
-- @echo "Cflags: -I$(DESTDIR)$(includedir)" >> $(X264GTK_PC)
-+ @echo "Libs: -L$(libdir) -lx264gtk" >> $(X264GTK_PC)
-+ @echo "Cflags: -I$(includedir)" >> $(X264GTK_PC)
-
- # Clean rule
- clean:
-@@ -140,8 +135,6 @@ install: $(ENCODE_BIN)
- @install -m 644 x264_gtk_enum.h "$(DESTDIR)$(includedir)"
- @echo " D: $(DESTDIR)$(libdir)"
- @install -d "$(DESTDIR)$(libdir)"
-- @echo " I: $(DESTDIR)$(libdir)/libx264gtk.a"
-- @install -m 644 libx264gtk.a "$(DESTDIR)$(libdir)"
- @echo " I: $(DESTDIR)$(libdir)/libx264gtk.$(SOSUFFIX)"
- @$(if $(SONAMEGTK), ln -sf $(SONAMEGTK) $(DESTDIR)$(libdir)/libx264gtk.$(SOSUFFIX))
- @$(if $(SONAMEGTK), install -m 755 $(SONAMEGTK) $(DESTDIR)$(libdir))
-diff -up x264-20080905/Makefile.r x264-20080905/Makefile
---- x264-20080905/Makefile.r 2008-09-05 11:30:52.000000000 +0200
-+++ x264-20080905/Makefile 2008-09-05 11:41:36.000000000 +0200
-@@ -71,7 +71,7 @@ DEP = depend
-
- .PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean
+ pclibs="-L$libdir -lx264 $libpthread"
--default: $(DEP) x264$(EXE)
-+default: $(DEP) x264$(EXE) x264_gtk_encode$(EXE)
-
- libx264.a: .depend $(OBJS) $(OBJASM)
+ cat > x264.pc << EOF
+diff -up x264-20081202/Makefile.r x264-20081202/Makefile
+--- x264-20081202/Makefile.r 2008-12-02 23:26:25.000000000 +0100
++++ x264-20081202/Makefile 2008-12-03 00:21:09.000000000 +0100
+@@ -77,14 +77,25 @@ libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
-@@ -79,15 +79,16 @@ libx264.a: .depend $(OBJS) $(OBJASM)
+ ranlib libx264.a
++libx264.so: $(SONAME)
++ ln -sf $(SONAME) libx264.$(SOSUFFIX)
++
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
-+ ln -s $(SONAME) libx264.so
--x264$(EXE): $(OBJCLI) libx264.a
-- $(CC) -o $@ $+ $(LDFLAGS)
-+x264$(EXE): $(OBJCLI) $(SONAME)
++ifneq ($(SONAME),)
++x264$(EXE): $(OBJCLI) libx264.so
+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
-
--libx264gtk.a: muxers.o libx264.a
-+x264_gtk_encode$(EXE): muxers.o $(SONAME)
- $(MAKE) -C gtk
-
--checkasm: tools/checkasm.o libx264.a
-- $(CC) -o $@ $+ $(LDFLAGS)
++
+checkasm: tools/checkasm.o $(SONAME)
+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
++else
+ x264$(EXE): $(OBJCLI) libx264.a
+ $(CC) -o $@ $+ $(LDFLAGS)
+
+ checkasm: tools/checkasm.o libx264.a
+ $(CC) -o $@ $+ $(LDFLAGS)
++endif
%.o: %.asm
$(AS) $(ASFLAGS) -o $@ $<
-@@ -154,10 +155,8 @@ install: x264$(EXE) $(SONAME)
+@@ -148,10 +159,12 @@ install: x264$(EXE) $(SONAME)
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
install -m 644 x264.h $(DESTDIR)$(includedir)
-- install -m 644 libx264.a $(DESTDIR)$(libdir)
++ifeq ($(SONAME),)
+ install -m 644 libx264.a $(DESTDIR)$(libdir)
++ ranlib $(DESTDIR)$(libdir)/libx264.a
++endif
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
install x264$(EXE) $(DESTDIR)$(bindir)
- ranlib $(DESTDIR)$(libdir)/libx264.a
ifeq ($(SYS),MINGW)
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
else
-@@ -166,7 +165,7 @@ else
- endif
- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
-
--install-gtk: libx264gtk.a
-+install-gtk: x264_gtk_encode$(EXE)
- $(MAKE) -C gtk install
-
- uninstall:
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- x264.spec 17 Nov 2008 20:20:29 -0000 1.4
+++ x264.spec 2 Dec 2008 23:33:45 -0000 1.5
@@ -1,28 +1,23 @@
-%define snapshot 20080905
+%define snapshot 20081202
+%define git 71d34b4
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.18.%{snapshot}%{?dist}
+Release: 0.19.%{snapshot}git%{git}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
Source0: http://rpm.greysector.net/livna/%{name}-%{snapshot}.tar.bz2
Source1: x264-snapshot.sh
-Source2: %{name}.desktop
Patch0: %{name}-rpm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-BuildRequires: desktop-file-utils
-# version.sh requires git
-BuildRequires: git-core
-BuildRequires: gtk2-devel
-BuildRequires: gettext
BuildRequires: gpac-devel
-BuildRequires: ImageMagick
%ifarch x86_64 %{ix86}
BuildRequires: yasm
%endif
Requires: %{name}-libs = %{version}-%{release}
+Obsoletes: %{name}-gui < 0.0.0-0.19
%description
x264 is a free library for encoding H264/AVC video streams, written from
@@ -51,35 +46,6 @@
This package contains the development files.
-%package gui
-Summary: GUI for x264 encoder
-Group: Applications/Multimedia
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Obsoletes: %{name}-gtk < %{version}-%{release}
-Provides: %{name}-gtk = %{version}-%{release}
-
-%description gui
-x264 is a free library for encoding H264/AVC video streams, written from
-scratch.
-
-This package contains the GTK GUI.
-
-%package gui-devel
-Summary: Development files for the x264 encoder GUI
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-gui = %{version}-%{release}
-Requires: pkgconfig
-Obsoletes: %{name}-gtk-devel < %{version}-%{release}
-Provides: %{name}-gtk-devel = %{version}-%{release}
-
-%description gui-devel
-x264 is a free library for encoding H264/AVC video streams, written from
-scratch.
-
-This package contains the GUI development files.
-
%define x_configure \
./configure \\\
--host=%{_target_platform} \\\
@@ -88,7 +54,7 @@
--bindir=%{_bindir} \\\
--includedir=%{_includedir} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
- %{?_with_gpac:--enable-mp4-output} \\\
+ --enable-mp4-output \\\
%{?_with_visualize:--enable-visualize} \\\
--enable-pthread \\\
--enable-debug \\\
@@ -102,28 +68,37 @@
# AUTHORS file is in iso-8859-1
iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
mv -f AUTHORS.utf8 AUTHORS
-convert gtk/x264.ico x264icon.png
+%ifarch %{ix86}
+mkdir sse2
+cp -a `ls -1|grep -v sse2` sse2/
+%endif
%build
%{x_configure}\
--libdir=%{_libdir} \
- --enable-gtk \
+%ifarch %{ix86}
+ --disable-asm
+%endif
%{__make} %{?_smp_mflags}
+%ifarch %{ix86}
+pushd sse2
+%{x_configure}\
+ --libdir=%{_libdir}/sse2 \
+
+%{__make} %{?_smp_mflags}
+popd
+%endif
%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
-
-desktop-file-install --vendor livna \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --mode 644 \
- %{SOURCE2}
-
-%{__install} -Dpm 644 x264icon.png \
- %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-
-%find_lang %{name}_gtk
+%ifarch %{ix86}
+pushd sse2
+%{__make} DESTDIR=%{buildroot} install
+popd
+rm %{buildroot}%{_libdir}/sse2/pkgconfig/x264.pc
+%endif
%clean
%{__rm} -rf %{buildroot}
@@ -132,20 +107,6 @@
%postun libs -p /sbin/ldconfig
-%post gui
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-%postun gui
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
%files
%defattr(644, root, root, 0755)
%doc AUTHORS COPYING
@@ -154,6 +115,9 @@
%files libs
%defattr(644, root, root, 0755)
%{_libdir}/libx264.so.*
+%ifarch %{ix86}
+%{_libdir}/sse2/libx264.so.*
+%endif
%files devel
%defattr(644, root, root, 0755)
@@ -161,22 +125,18 @@
%{_includedir}/x264.h
%{_libdir}/libx264.so
%{_libdir}/pkgconfig/%{name}.pc
-
-%files gui -f %{name}_gtk.lang
-%defattr(644, root, root, 0755)
-%attr(755,root,root) %{_bindir}/x264_gtk_encode
-%{_libdir}/libx264gtk.so.*
-%{_datadir}/x264/
-%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/x264.png
-
-%files gui-devel
-%defattr(644, root, root, 0755)
-%{_includedir}/x264_gtk*.h
-%{_libdir}/libx264gtk.so
-%{_libdir}/pkgconfig/%{name}gtk.pc
+%ifarch %{ix86}
+%{_libdir}/sse2/libx264.so
+%endif
%changelog
+* Tue Dec 02 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.19.20081202git71d34b4
+- 20081202 snapshot
+- bring back asm optimized/unoptimized libs split
+- rebase and improve patch
+- GUI dropped upstream
+- dropped redundant BRs
+
* Mon Nov 17 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.18.20080905
- partially revert latest changes (the separate sse2 libs part) until selinux
policy catches up
--- x264.desktop DELETED ---
15 years, 11 months
rpms/xorg-x11-drv-nvidia/F-10 xorg-x11-drv-nvidia.spec,1.8,1.9
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32546/F-10
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix upgrade path
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-nvidia.spec 13 Nov 2008 09:05:11 -0000 1.8
+++ xorg-x11-drv-nvidia.spec 2 Dec 2008 18:54:06 -0000 1.9
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 177.82
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -54,7 +54,7 @@
Obsoletes: nvidia-x11-drv < %{version}-%{release}
Provides: nvidia-x11-drv = %{version}-%{release}
-Obsoletes: xorg-x11-drv-nvidia-newest < 177.80-100
+Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
@@ -277,6 +277,9 @@
%changelog
+* Tue Dec 2 2008 Stewart Adam <s.adam at diffingo.com> - 177.82-2
+- Fix upgrade path for nvidia-newest (bz#191)
+
* Thu Nov 13 2008 kwizart < kwizart at gmail.com > - 177.82-1
- Update to 177.82
15 years, 11 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.8,1.9
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32546/devel
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix upgrade path
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-nvidia.spec 13 Nov 2008 09:05:11 -0000 1.8
+++ xorg-x11-drv-nvidia.spec 2 Dec 2008 18:54:06 -0000 1.9
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 177.82
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -54,7 +54,7 @@
Obsoletes: nvidia-x11-drv < %{version}-%{release}
Provides: nvidia-x11-drv = %{version}-%{release}
-Obsoletes: xorg-x11-drv-nvidia-newest < 177.80-100
+Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
@@ -277,6 +277,9 @@
%changelog
+* Tue Dec 2 2008 Stewart Adam <s.adam at diffingo.com> - 177.82-2
+- Fix upgrade path for nvidia-newest (bz#191)
+
* Thu Nov 13 2008 kwizart < kwizart at gmail.com > - 177.82-1
- Update to 177.82
15 years, 11 months
rpms/wl-kmod/F-10 wl-kmod.spec,1.8,1.9
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/wl-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27788
Modified Files:
wl-kmod.spec
Log Message:
* Tue Dec 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.6
- rebuild for latest Fedora kernel;
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-10/wl-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wl-kmod.spec 22 Nov 2008 13:49:15 -0000 1.8
+++ wl-kmod.spec 2 Dec 2008 06:44:12 -0000 1.9
@@ -3,11 +3,11 @@
# "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: wl-kmod
Version: 5.10.27.6
-Release: 5%{?dist}.5
+Release: 5%{?dist}.6
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -84,6 +84,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Dec 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.6
+- rebuild for latest Fedora kernel;
+
* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.5
- rebuild for latest Fedora kernel;
15 years, 12 months
rpms/slmodem-kmod/F-10 slmodem-kmod.spec,1.11,1.12
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/slmodem-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27388
Modified Files:
slmodem-kmod.spec
Log Message:
* Tue Dec 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.11
- rebuild for latest Fedora kernel;
Index: slmodem-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/F-10/slmodem-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- slmodem-kmod.spec 22 Nov 2008 20:52:15 -0000 1.11
+++ slmodem-kmod.spec 2 Dec 2008 06:43:57 -0000 1.12
@@ -3,7 +3,7 @@
# "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
%define filever 2.9.11-20080817
%define datetag 20080817
@@ -12,7 +12,7 @@
Name: slmodem-kmod
Version: 2.9.11
-Release: 26%{?dist}.10
+Release: 26%{?dist}.11
Summary: Proprietary SmartLink softmodem kernel drivers
Group: System Environment/Kernel
@@ -102,6 +102,9 @@
%changelog
+* Tue Dec 02 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.11
+- rebuild for latest Fedora kernel;
+
* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.10
- rebuilt
15 years, 12 months
