rpms/meka/F-13 meka-0.72-buffer_overflow.patch, NONE, 1.1 meka-0.72-rpmopt.patch, NONE, 1.1 meka-0.73-execstack.patch, NONE, 1.1 meka-0.73-gcc45.patch, NONE, 1.1 meka-0.73-noseal.patch, NONE, 1.1 meka.desktop, NONE, 1.1 meka.sh, NONE, 1.1 meka.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/meka/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17762/F-13
Modified Files:
.cvsignore sources
Added Files:
meka-0.72-buffer_overflow.patch meka-0.72-rpmopt.patch
meka-0.73-execstack.patch meka-0.73-gcc45.patch
meka-0.73-noseal.patch meka.desktop meka.sh meka.spec
Log Message:
First import
meka-0.72-buffer_overflow.patch:
meka.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE meka-0.72-buffer_overflow.patch ---
diff -dur meka.orig/srcs/meka.h meka/srcs/meka.h
--- meka.orig/srcs/meka.h 2007-05-08 20:47:24.000000000 +0200
+++ meka/srcs/meka.h 2007-05-25 19:26:05.000000000 +0200
@@ -144,9 +144,9 @@
// Max path length
// FIXME: Portable way to obtain this at compilation stage?
-#define FILENAME_LEN (512)
+//#define FILENAME_LEN (512)
//#define FILENAME_LEN MAXPATHLEN
-//#define FILENAME_LEN PATH_MAX
+#define FILENAME_LEN PATH_MAX
OPT_TYPE opt;
TGFX_TYPE tgfx;
meka-0.72-rpmopt.patch:
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE meka-0.72-rpmopt.patch ---
--- meka.orig/srcs/Makefile 2005-09-25 17:15:24.000000000 +0200
+++ meka/srcs/Makefile 2006-12-16 14:11:46.000000000 +0100
@@ -280,6 +286,7 @@
#-----------------------------------------------------
# Compiler Flags
#-----------------------------------------------------
+RPMFLAGS =
CFLAGS = $(INCLUDES) $(DEFINES)
ifeq ($(SYSTEM), win32)
@@ -291,7 +298,7 @@
# UNIX/MS-DOS
# RELEASE build
ifeq ($(BUILD), release)
-CFLAGS += -Wall -march=pentium -O6 -ffast-math -fno-strength-reduce -funroll-all-loops -fomit-frame-pointer
+CFLAGS += ${RPMFLAGS}
endif
# DEBUG build
ifeq ($(BUILD), debug)
meka-0.73-execstack.patch:
eagle.asm | 4 ++++
hq2x16.asm | 4 ++++
hq2x32.asm | 4 ++++
mappersa.asm | 4 ++++
videoasm.asm | 4 ++++
5 files changed, 20 insertions(+)
--- NEW FILE meka-0.73-execstack.patch ---
diff -dur meka.orig/srcs/eagle.asm meka/srcs/eagle.asm
--- meka.orig/srcs/eagle.asm 2007-07-29 20:58:28.000000000 +0200
+++ meka/srcs/eagle.asm 2008-08-22 17:39:10.000000000 +0200
@@ -1523,3 +1523,7 @@
_tripline3 resb 8
_dlx resb 32
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/hq2x16.asm meka/srcs/hq2x16.asm
--- meka.orig/srcs/hq2x16.asm 2007-07-29 20:58:29.000000000 +0200
+++ meka/srcs/hq2x16.asm 2008-08-22 17:38:32.000000000 +0200
@@ -1936,3 +1936,7 @@
dd ..@cross8, ..@flag0, ..@flag0, ..@flag0,
dd ..@flag0, ..@flag0, ..@flag0, ..@flag0
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/hq2x32.asm meka/srcs/hq2x32.asm
--- meka.orig/srcs/hq2x32.asm 2007-07-29 20:58:29.000000000 +0200
+++ meka/srcs/hq2x32.asm 2008-08-22 17:39:56.000000000 +0200
@@ -1934,3 +1934,7 @@
dd ..@cross8, ..@crossN, ..@crossN, ..@crossN,
dd ..@crossN, ..@crossN, ..@crossN, ..@crossN
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/mappersa.asm meka/srcs/mappersa.asm
--- meka.orig/srcs/mappersa.asm 2008-06-12 22:22:15.000000000 +0200
+++ meka/srcs/mappersa.asm 2008-08-22 17:38:55.000000000 +0200
@@ -173,3 +173,7 @@
END
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/videoasm.asm meka/srcs/videoasm.asm
--- meka.orig/srcs/videoasm.asm 2007-07-29 20:58:29.000000000 +0200
+++ meka/srcs/videoasm.asm 2008-08-22 17:56:49.000000000 +0200
@@ -495,3 +495,7 @@
;------------------------------------------------------------------------------
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
meka-0.73-gcc45.patch:
blit.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE meka-0.73-gcc45.patch ---
diff -durN meka.orig/srcs/blit.c meka/srcs/blit.c
--- meka.orig/srcs/blit.c 2007-05-27 04:45:48.000000000 +0200
+++ meka/srcs/blit.c 2010-11-20 15:35:52.286493356 +0100
@@ -230,8 +230,10 @@
const u32 color_mod_g = ((color_org >> 5 ) & 0x3F) * blit_cfg.tv_mode_factor;
const u32 color_mod_b = ((color_org >> 11) & 0x1F) * blit_cfg.tv_mode_factor;
const u16 color_mod = (color_mod_r) | (color_mod_g << 5) | (color_mod_b << 11);
- *((u16 *)pdst1)++ = color_org;
- *((u16 *)pdst2)++ = color_mod;
+ *((u16 *)pdst1) = color_org;
+ *pdst1 += sizeof(u16);
+ *((u16 *)pdst2) = color_mod;
+ *pdst2 += sizeof(u16);
}
}
Blit_Fullscreen_Misc();
meka-0.73-noseal.patch:
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE meka-0.73-noseal.patch ---
diff -dur meka/srcs/Makefile meka.noseal/srcs/Makefile
--- meka/srcs/Makefile 2008-03-15 23:38:10.000000000 +0100
+++ meka.noseal/srcs/Makefile 2008-08-22 15:01:52.000000000 +0200
@@ -88,7 +88,7 @@
MKDIR = mkdir
#--- Definitions
DEF_OS = -DARCH_UNIX -DX86_ASM -DASM_SYMBOLS_REQUIRE_UNDERSCORE
-INC_OS = -Ilibs -I../include # This may require an update
+INC_OS = -Ilibs -I../include -I../libs/seal/include # This may require an update
X86_ASM = yes
#--- Libraries
LIB_OS = -Llibs -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L../lib # This may require an update
@@ -184,7 +184,7 @@
endif
ifeq ($(SYSTEM), unix)
-LIB_SOUND = -lseal
+OBJ_SOUND += $(OD)/sound/null_seal.o
endif
ifeq ($(SYSTEM), macosx)
--- NEW FILE meka.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Meka
Comment=Multi machine emulator for MS-DOS, MS-Windows and GNU/Linux
Exec=meka
Icon=meka
Terminal=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE meka.sh ---
#!/bin/sh
GAME=meka
VERSION=0.73
GAME_LOCALDIR=$HOME/.$GAME
GAME_DATADIR=/usr/share/$GAME
GAME_EXECUTABLE=/usr/libexec/$GAME/$GAME
GAME_DOCDIR=/usr/share/doc/$GAME-$VERSION
mkdir -p $GAME_LOCALDIR
cd $GAME_LOCALDIR
# Create link to game file
ln -sf $GAME_EXECUTABLE $GAME
# Create links to files which are not (usually) modified by users
for file in meka.{dat,msg,nam,pat,thm}; do
ln -sf $GAME_DATADIR/$file $file
done
# Copy files which can be modified by users
for file in meka.{blt,inp}; do
test -e $file || cp -a $GAME_DATADIR/$file $file
done
# Create links to doc files
for file in {changes.txt,compat.txt,debugger.txt,mekanix.txt,meka.txt,multi.txt}; do
ln -sf $GAME_DOCDIR/$file $file
done
exec ./$GAME "$@"
--- NEW FILE meka.spec ---
%define pkgdate 2010-05-30
%define pkgversion %(echo %version|sed s/\\\\\.//g)
Name: meka
Version: 0.73
Release: 4%{?dist}
Summary: Sega 8-bit machine emulator
Group: Applications/Emulators
License: MEKA and non-commercial
URL: http://www.smspower.org/meka/
Source0: http://www.smspower.org/meka/releases/%{name}-%{pkgdate}-srcs-v%{pkgversi...
Source1: %{name}.sh
Source2: %{name}.desktop
Patch0: %{name}-0.72-rpmopt.patch
Patch1: %{name}-0.72-buffer_overflow.patch
# http://www.smspower.org/forums/viewtopic.php?t=12699
Patch2: %{name}-0.73-execstack.patch
# http://www.smspower.org/forums/viewtopic.php?t=10848
# http://www.smspower.org/forums/viewtopic.php?t=12699
Patch3: %{name}-0.73-noseal.patch
# http://www.smspower.org/forums/viewtopic.php?t=12699
Patch4: %{name}-0.73-gcc45.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is package contains ix86 asm code
ExclusiveArch: i686
BuildRequires: allegro-devel
BuildRequires: nasm
BuildRequires: libpng-devel
BuildRequires: libXpm-devel
BuildRequires: libXxf86dga-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
MEKA is a multi machine emulator, originally started as a Sega Master System
emulator, and generally very oriented toward Z80-based Sega 8-bit systems.
MEKA officially emulates the following systems:
- Sega Game 1000 / SG-1000 / Japan, Oceania
- Sega Computer 3000 / SC-3000 / Japan, Oceania, Europe
- Super Control Station / SF-7000 / Japan, Oceania, Europe
- Sega Mark III / MK3 / Japan
+ FM Unit Extension / MK3+FM / Japan
- Sega Master System / SMS / World Wide
- Sega Game Gear / GG / World Wide
- ColecoVision / COLECO / America, Europe
- Othello Multivision / OMV / Japan
You can play other systems on it only if you are smart enough to figure how.
And if you are, I doubt you will want to play Nintendo games. So forget it.
%prep
%setup -q -c
# Fix CFLAGS in Makefilie
%patch0 -p1
# Fix buffer overflows
%patch1 -p1
# Patch not to require an executable stack
%patch2 -p1
# Patch not to require libseal (audio is severly broken)
%patch3 -p1
# Patch to compile with gcc 4.5
%patch4 -p1
# Remove pre-built lib files
find -name '*.lib' -exec rm -f '{}' \;
# Fix end-of-line-encoding
sed -i 's/\r//' *.txt
# Fix char encondigs
for i in *.txt; do
iconv --from=ISO-8859-1 --to=UTF-8 $i > $i.utf8
mv $i.utf8 $i
done
%build
cd srcs
# make doesn't compile with %%{?_smp_mflags}
make RPMFLAGS="%{optflags}"
%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_bindir}
install -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/meka
install -d %{buildroot}/%{_libexecdir}/meka
install -m 755 meka %{buildroot}/%{_libexecdir}/meka
install -d %{buildroot}/%{_datadir}/meka
install -m 644 meka.{blt,dat,inp,msg,nam,pat,thm} %{buildroot}/%{_datadir}/meka
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
# install icons
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32}/apps
convert -delete 1 srcs/mekaw.ico \
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
convert -delete 0 srcs/mekaw.ico \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%{_bindir}/meka
%{_libexecdir}/meka
%{_datadir}/meka
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%doc changes.txt compat.txt debugger.txt history.txt mekanix.txt
%doc meka.txt multi.txt sources.txt tech.txt TODO.txt
%changelog
* Sat Dec 11 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-4
- Fixed license
* Sat Dec 04 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-3
- Changed summary
- Removed pre-built lib files
- Fixed execstack patch
- Fixed consistent use of macros
- Minor changes
* Sat Nov 20 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-2
- Added a patch to compile with gcc4.5
* Sun Jun 13 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-1
- New upstream release
* Thu Jul 30 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.73-0.1.20080619
- First release
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/meka/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Dec 2010 01:07:56 -0000 1.1
+++ .cvsignore 31 Dec 2010 18:37:16 -0000 1.2
@@ -0,0 +1 @@
+meka-2010-05-30-srcs-v073.zip
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/meka/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Dec 2010 01:07:56 -0000 1.1
+++ sources 31 Dec 2010 18:37:16 -0000 1.2
@@ -0,0 +1 @@
+15d7201bb3de0d2e4c4683be57e614bc meka-2010-05-30-srcs-v073.zip
13 years, 3 months
rpms/meka/F-14 meka-0.72-buffer_overflow.patch, NONE, 1.1 meka-0.72-rpmopt.patch, NONE, 1.1 meka-0.73-execstack.patch, NONE, 1.1 meka-0.73-gcc45.patch, NONE, 1.1 meka-0.73-noseal.patch, NONE, 1.1 meka.desktop, NONE, 1.1 meka.sh, NONE, 1.1 meka.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/meka/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17395/F-14
Modified Files:
.cvsignore sources
Added Files:
meka-0.72-buffer_overflow.patch meka-0.72-rpmopt.patch
meka-0.73-execstack.patch meka-0.73-gcc45.patch
meka-0.73-noseal.patch meka.desktop meka.sh meka.spec
Log Message:
First import
meka-0.72-buffer_overflow.patch:
meka.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE meka-0.72-buffer_overflow.patch ---
diff -dur meka.orig/srcs/meka.h meka/srcs/meka.h
--- meka.orig/srcs/meka.h 2007-05-08 20:47:24.000000000 +0200
+++ meka/srcs/meka.h 2007-05-25 19:26:05.000000000 +0200
@@ -144,9 +144,9 @@
// Max path length
// FIXME: Portable way to obtain this at compilation stage?
-#define FILENAME_LEN (512)
+//#define FILENAME_LEN (512)
//#define FILENAME_LEN MAXPATHLEN
-//#define FILENAME_LEN PATH_MAX
+#define FILENAME_LEN PATH_MAX
OPT_TYPE opt;
TGFX_TYPE tgfx;
meka-0.72-rpmopt.patch:
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE meka-0.72-rpmopt.patch ---
--- meka.orig/srcs/Makefile 2005-09-25 17:15:24.000000000 +0200
+++ meka/srcs/Makefile 2006-12-16 14:11:46.000000000 +0100
@@ -280,6 +286,7 @@
#-----------------------------------------------------
# Compiler Flags
#-----------------------------------------------------
+RPMFLAGS =
CFLAGS = $(INCLUDES) $(DEFINES)
ifeq ($(SYSTEM), win32)
@@ -291,7 +298,7 @@
# UNIX/MS-DOS
# RELEASE build
ifeq ($(BUILD), release)
-CFLAGS += -Wall -march=pentium -O6 -ffast-math -fno-strength-reduce -funroll-all-loops -fomit-frame-pointer
+CFLAGS += ${RPMFLAGS}
endif
# DEBUG build
ifeq ($(BUILD), debug)
meka-0.73-execstack.patch:
eagle.asm | 4 ++++
hq2x16.asm | 4 ++++
hq2x32.asm | 4 ++++
mappersa.asm | 4 ++++
videoasm.asm | 4 ++++
5 files changed, 20 insertions(+)
--- NEW FILE meka-0.73-execstack.patch ---
diff -dur meka.orig/srcs/eagle.asm meka/srcs/eagle.asm
--- meka.orig/srcs/eagle.asm 2007-07-29 20:58:28.000000000 +0200
+++ meka/srcs/eagle.asm 2008-08-22 17:39:10.000000000 +0200
@@ -1523,3 +1523,7 @@
_tripline3 resb 8
_dlx resb 32
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/hq2x16.asm meka/srcs/hq2x16.asm
--- meka.orig/srcs/hq2x16.asm 2007-07-29 20:58:29.000000000 +0200
+++ meka/srcs/hq2x16.asm 2008-08-22 17:38:32.000000000 +0200
@@ -1936,3 +1936,7 @@
dd ..@cross8, ..@flag0, ..@flag0, ..@flag0,
dd ..@flag0, ..@flag0, ..@flag0, ..@flag0
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/hq2x32.asm meka/srcs/hq2x32.asm
--- meka.orig/srcs/hq2x32.asm 2007-07-29 20:58:29.000000000 +0200
+++ meka/srcs/hq2x32.asm 2008-08-22 17:39:56.000000000 +0200
@@ -1934,3 +1934,7 @@
dd ..@cross8, ..@crossN, ..@crossN, ..@crossN,
dd ..@crossN, ..@crossN, ..@crossN, ..@crossN
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/mappersa.asm meka/srcs/mappersa.asm
--- meka.orig/srcs/mappersa.asm 2008-06-12 22:22:15.000000000 +0200
+++ meka/srcs/mappersa.asm 2008-08-22 17:38:55.000000000 +0200
@@ -173,3 +173,7 @@
END
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/videoasm.asm meka/srcs/videoasm.asm
--- meka.orig/srcs/videoasm.asm 2007-07-29 20:58:29.000000000 +0200
+++ meka/srcs/videoasm.asm 2008-08-22 17:56:49.000000000 +0200
@@ -495,3 +495,7 @@
;------------------------------------------------------------------------------
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
meka-0.73-gcc45.patch:
blit.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE meka-0.73-gcc45.patch ---
diff -durN meka.orig/srcs/blit.c meka/srcs/blit.c
--- meka.orig/srcs/blit.c 2007-05-27 04:45:48.000000000 +0200
+++ meka/srcs/blit.c 2010-11-20 15:35:52.286493356 +0100
@@ -230,8 +230,10 @@
const u32 color_mod_g = ((color_org >> 5 ) & 0x3F) * blit_cfg.tv_mode_factor;
const u32 color_mod_b = ((color_org >> 11) & 0x1F) * blit_cfg.tv_mode_factor;
const u16 color_mod = (color_mod_r) | (color_mod_g << 5) | (color_mod_b << 11);
- *((u16 *)pdst1)++ = color_org;
- *((u16 *)pdst2)++ = color_mod;
+ *((u16 *)pdst1) = color_org;
+ *pdst1 += sizeof(u16);
+ *((u16 *)pdst2) = color_mod;
+ *pdst2 += sizeof(u16);
}
}
Blit_Fullscreen_Misc();
meka-0.73-noseal.patch:
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE meka-0.73-noseal.patch ---
diff -dur meka/srcs/Makefile meka.noseal/srcs/Makefile
--- meka/srcs/Makefile 2008-03-15 23:38:10.000000000 +0100
+++ meka.noseal/srcs/Makefile 2008-08-22 15:01:52.000000000 +0200
@@ -88,7 +88,7 @@
MKDIR = mkdir
#--- Definitions
DEF_OS = -DARCH_UNIX -DX86_ASM -DASM_SYMBOLS_REQUIRE_UNDERSCORE
-INC_OS = -Ilibs -I../include # This may require an update
+INC_OS = -Ilibs -I../include -I../libs/seal/include # This may require an update
X86_ASM = yes
#--- Libraries
LIB_OS = -Llibs -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L../lib # This may require an update
@@ -184,7 +184,7 @@
endif
ifeq ($(SYSTEM), unix)
-LIB_SOUND = -lseal
+OBJ_SOUND += $(OD)/sound/null_seal.o
endif
ifeq ($(SYSTEM), macosx)
--- NEW FILE meka.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Meka
Comment=Multi machine emulator for MS-DOS, MS-Windows and GNU/Linux
Exec=meka
Icon=meka
Terminal=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE meka.sh ---
#!/bin/sh
GAME=meka
VERSION=0.73
GAME_LOCALDIR=$HOME/.$GAME
GAME_DATADIR=/usr/share/$GAME
GAME_EXECUTABLE=/usr/libexec/$GAME/$GAME
GAME_DOCDIR=/usr/share/doc/$GAME-$VERSION
mkdir -p $GAME_LOCALDIR
cd $GAME_LOCALDIR
# Create link to game file
ln -sf $GAME_EXECUTABLE $GAME
# Create links to files which are not (usually) modified by users
for file in meka.{dat,msg,nam,pat,thm}; do
ln -sf $GAME_DATADIR/$file $file
done
# Copy files which can be modified by users
for file in meka.{blt,inp}; do
test -e $file || cp -a $GAME_DATADIR/$file $file
done
# Create links to doc files
for file in {changes.txt,compat.txt,debugger.txt,mekanix.txt,meka.txt,multi.txt}; do
ln -sf $GAME_DOCDIR/$file $file
done
exec ./$GAME "$@"
--- NEW FILE meka.spec ---
%define pkgdate 2010-05-30
%define pkgversion %(echo %version|sed s/\\\\\.//g)
Name: meka
Version: 0.73
Release: 4%{?dist}
Summary: Sega 8-bit machine emulator
Group: Applications/Emulators
License: MEKA and non-commercial
URL: http://www.smspower.org/meka/
Source0: http://www.smspower.org/meka/releases/%{name}-%{pkgdate}-srcs-v%{pkgversi...
Source1: %{name}.sh
Source2: %{name}.desktop
Patch0: %{name}-0.72-rpmopt.patch
Patch1: %{name}-0.72-buffer_overflow.patch
# http://www.smspower.org/forums/viewtopic.php?t=12699
Patch2: %{name}-0.73-execstack.patch
# http://www.smspower.org/forums/viewtopic.php?t=10848
# http://www.smspower.org/forums/viewtopic.php?t=12699
Patch3: %{name}-0.73-noseal.patch
# http://www.smspower.org/forums/viewtopic.php?t=12699
Patch4: %{name}-0.73-gcc45.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is package contains ix86 asm code
ExclusiveArch: i686
BuildRequires: allegro-devel
BuildRequires: nasm
BuildRequires: libpng-devel
BuildRequires: libXpm-devel
BuildRequires: libXxf86dga-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
MEKA is a multi machine emulator, originally started as a Sega Master System
emulator, and generally very oriented toward Z80-based Sega 8-bit systems.
MEKA officially emulates the following systems:
- Sega Game 1000 / SG-1000 / Japan, Oceania
- Sega Computer 3000 / SC-3000 / Japan, Oceania, Europe
- Super Control Station / SF-7000 / Japan, Oceania, Europe
- Sega Mark III / MK3 / Japan
+ FM Unit Extension / MK3+FM / Japan
- Sega Master System / SMS / World Wide
- Sega Game Gear / GG / World Wide
- ColecoVision / COLECO / America, Europe
- Othello Multivision / OMV / Japan
You can play other systems on it only if you are smart enough to figure how.
And if you are, I doubt you will want to play Nintendo games. So forget it.
%prep
%setup -q -c
# Fix CFLAGS in Makefilie
%patch0 -p1
# Fix buffer overflows
%patch1 -p1
# Patch not to require an executable stack
%patch2 -p1
# Patch not to require libseal (audio is severly broken)
%patch3 -p1
# Patch to compile with gcc 4.5
%patch4 -p1
# Remove pre-built lib files
find -name '*.lib' -exec rm -f '{}' \;
# Fix end-of-line-encoding
sed -i 's/\r//' *.txt
# Fix char encondigs
for i in *.txt; do
iconv --from=ISO-8859-1 --to=UTF-8 $i > $i.utf8
mv $i.utf8 $i
done
%build
cd srcs
# make doesn't compile with %%{?_smp_mflags}
make RPMFLAGS="%{optflags}"
%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_bindir}
install -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/meka
install -d %{buildroot}/%{_libexecdir}/meka
install -m 755 meka %{buildroot}/%{_libexecdir}/meka
install -d %{buildroot}/%{_datadir}/meka
install -m 644 meka.{blt,dat,inp,msg,nam,pat,thm} %{buildroot}/%{_datadir}/meka
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
# install icons
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32}/apps
convert -delete 1 srcs/mekaw.ico \
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
convert -delete 0 srcs/mekaw.ico \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%{_bindir}/meka
%{_libexecdir}/meka
%{_datadir}/meka
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%doc changes.txt compat.txt debugger.txt history.txt mekanix.txt
%doc meka.txt multi.txt sources.txt tech.txt TODO.txt
%changelog
* Sat Dec 11 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-4
- Fixed license
* Sat Dec 04 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-3
- Changed summary
- Removed pre-built lib files
- Fixed execstack patch
- Fixed consistent use of macros
- Minor changes
* Sat Nov 20 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-2
- Added a patch to compile with gcc4.5
* Sun Jun 13 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-1
- New upstream release
* Thu Jul 30 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.73-0.1.20080619
- First release
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/meka/F-14/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Dec 2010 01:07:56 -0000 1.1
+++ .cvsignore 31 Dec 2010 18:35:09 -0000 1.2
@@ -0,0 +1 @@
+meka-2010-05-30-srcs-v073.zip
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/meka/F-14/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Dec 2010 01:07:56 -0000 1.1
+++ sources 31 Dec 2010 18:35:09 -0000 1.2
@@ -0,0 +1 @@
+15d7201bb3de0d2e4c4683be57e614bc meka-2010-05-30-srcs-v073.zip
13 years, 3 months
rpms/meka/devel meka-0.72-buffer_overflow.patch, NONE, 1.1 meka-0.72-rpmopt.patch, NONE, 1.1 meka-0.73-execstack.patch, NONE, 1.1 meka-0.73-gcc45.patch, NONE, 1.1 meka-0.73-noseal.patch, NONE, 1.1 meka.desktop, NONE, 1.1 meka.sh, NONE, 1.1 meka.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/nonfree/rpms/meka/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16907/devel
Modified Files:
.cvsignore sources
Added Files:
meka-0.72-buffer_overflow.patch meka-0.72-rpmopt.patch
meka-0.73-execstack.patch meka-0.73-gcc45.patch
meka-0.73-noseal.patch meka.desktop meka.sh meka.spec
Log Message:
First import
meka-0.72-buffer_overflow.patch:
meka.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE meka-0.72-buffer_overflow.patch ---
diff -dur meka.orig/srcs/meka.h meka/srcs/meka.h
--- meka.orig/srcs/meka.h 2007-05-08 20:47:24.000000000 +0200
+++ meka/srcs/meka.h 2007-05-25 19:26:05.000000000 +0200
@@ -144,9 +144,9 @@
// Max path length
// FIXME: Portable way to obtain this at compilation stage?
-#define FILENAME_LEN (512)
+//#define FILENAME_LEN (512)
//#define FILENAME_LEN MAXPATHLEN
-//#define FILENAME_LEN PATH_MAX
+#define FILENAME_LEN PATH_MAX
OPT_TYPE opt;
TGFX_TYPE tgfx;
meka-0.72-rpmopt.patch:
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE meka-0.72-rpmopt.patch ---
--- meka.orig/srcs/Makefile 2005-09-25 17:15:24.000000000 +0200
+++ meka/srcs/Makefile 2006-12-16 14:11:46.000000000 +0100
@@ -280,6 +286,7 @@
#-----------------------------------------------------
# Compiler Flags
#-----------------------------------------------------
+RPMFLAGS =
CFLAGS = $(INCLUDES) $(DEFINES)
ifeq ($(SYSTEM), win32)
@@ -291,7 +298,7 @@
# UNIX/MS-DOS
# RELEASE build
ifeq ($(BUILD), release)
-CFLAGS += -Wall -march=pentium -O6 -ffast-math -fno-strength-reduce -funroll-all-loops -fomit-frame-pointer
+CFLAGS += ${RPMFLAGS}
endif
# DEBUG build
ifeq ($(BUILD), debug)
meka-0.73-execstack.patch:
eagle.asm | 4 ++++
hq2x16.asm | 4 ++++
hq2x32.asm | 4 ++++
mappersa.asm | 4 ++++
videoasm.asm | 4 ++++
5 files changed, 20 insertions(+)
--- NEW FILE meka-0.73-execstack.patch ---
diff -dur meka.orig/srcs/eagle.asm meka/srcs/eagle.asm
--- meka.orig/srcs/eagle.asm 2007-07-29 20:58:28.000000000 +0200
+++ meka/srcs/eagle.asm 2008-08-22 17:39:10.000000000 +0200
@@ -1523,3 +1523,7 @@
_tripline3 resb 8
_dlx resb 32
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/hq2x16.asm meka/srcs/hq2x16.asm
--- meka.orig/srcs/hq2x16.asm 2007-07-29 20:58:29.000000000 +0200
+++ meka/srcs/hq2x16.asm 2008-08-22 17:38:32.000000000 +0200
@@ -1936,3 +1936,7 @@
dd ..@cross8, ..@flag0, ..@flag0, ..@flag0,
dd ..@flag0, ..@flag0, ..@flag0, ..@flag0
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/hq2x32.asm meka/srcs/hq2x32.asm
--- meka.orig/srcs/hq2x32.asm 2007-07-29 20:58:29.000000000 +0200
+++ meka/srcs/hq2x32.asm 2008-08-22 17:39:56.000000000 +0200
@@ -1934,3 +1934,7 @@
dd ..@cross8, ..@crossN, ..@crossN, ..@crossN,
dd ..@crossN, ..@crossN, ..@crossN, ..@crossN
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/mappersa.asm meka/srcs/mappersa.asm
--- meka.orig/srcs/mappersa.asm 2008-06-12 22:22:15.000000000 +0200
+++ meka/srcs/mappersa.asm 2008-08-22 17:38:55.000000000 +0200
@@ -173,3 +173,7 @@
END
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
diff -dur meka.orig/srcs/videoasm.asm meka/srcs/videoasm.asm
--- meka.orig/srcs/videoasm.asm 2007-07-29 20:58:29.000000000 +0200
+++ meka/srcs/videoasm.asm 2008-08-22 17:56:49.000000000 +0200
@@ -495,3 +495,7 @@
;------------------------------------------------------------------------------
+%ifidn __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+
meka-0.73-gcc45.patch:
blit.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE meka-0.73-gcc45.patch ---
diff -durN meka.orig/srcs/blit.c meka/srcs/blit.c
--- meka.orig/srcs/blit.c 2007-05-27 04:45:48.000000000 +0200
+++ meka/srcs/blit.c 2010-11-20 15:35:52.286493356 +0100
@@ -230,8 +230,10 @@
const u32 color_mod_g = ((color_org >> 5 ) & 0x3F) * blit_cfg.tv_mode_factor;
const u32 color_mod_b = ((color_org >> 11) & 0x1F) * blit_cfg.tv_mode_factor;
const u16 color_mod = (color_mod_r) | (color_mod_g << 5) | (color_mod_b << 11);
- *((u16 *)pdst1)++ = color_org;
- *((u16 *)pdst2)++ = color_mod;
+ *((u16 *)pdst1) = color_org;
+ *pdst1 += sizeof(u16);
+ *((u16 *)pdst2) = color_mod;
+ *pdst2 += sizeof(u16);
}
}
Blit_Fullscreen_Misc();
meka-0.73-noseal.patch:
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE meka-0.73-noseal.patch ---
diff -dur meka/srcs/Makefile meka.noseal/srcs/Makefile
--- meka/srcs/Makefile 2008-03-15 23:38:10.000000000 +0100
+++ meka.noseal/srcs/Makefile 2008-08-22 15:01:52.000000000 +0200
@@ -88,7 +88,7 @@
MKDIR = mkdir
#--- Definitions
DEF_OS = -DARCH_UNIX -DX86_ASM -DASM_SYMBOLS_REQUIRE_UNDERSCORE
-INC_OS = -Ilibs -I../include # This may require an update
+INC_OS = -Ilibs -I../include -I../libs/seal/include # This may require an update
X86_ASM = yes
#--- Libraries
LIB_OS = -Llibs -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L../lib # This may require an update
@@ -184,7 +184,7 @@
endif
ifeq ($(SYSTEM), unix)
-LIB_SOUND = -lseal
+OBJ_SOUND += $(OD)/sound/null_seal.o
endif
ifeq ($(SYSTEM), macosx)
--- NEW FILE meka.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Meka
Comment=Multi machine emulator for MS-DOS, MS-Windows and GNU/Linux
Exec=meka
Icon=meka
Terminal=true
Type=Application
Categories=Game;Emulator;
--- NEW FILE meka.sh ---
#!/bin/sh
GAME=meka
VERSION=0.73
GAME_LOCALDIR=$HOME/.$GAME
GAME_DATADIR=/usr/share/$GAME
GAME_EXECUTABLE=/usr/libexec/$GAME/$GAME
GAME_DOCDIR=/usr/share/doc/$GAME-$VERSION
mkdir -p $GAME_LOCALDIR
cd $GAME_LOCALDIR
# Create link to game file
ln -sf $GAME_EXECUTABLE $GAME
# Create links to files which are not (usually) modified by users
for file in meka.{dat,msg,nam,pat,thm}; do
ln -sf $GAME_DATADIR/$file $file
done
# Copy files which can be modified by users
for file in meka.{blt,inp}; do
test -e $file || cp -a $GAME_DATADIR/$file $file
done
# Create links to doc files
for file in {changes.txt,compat.txt,debugger.txt,mekanix.txt,meka.txt,multi.txt}; do
ln -sf $GAME_DOCDIR/$file $file
done
exec ./$GAME "$@"
--- NEW FILE meka.spec ---
%define pkgdate 2010-05-30
%define pkgversion %(echo %version|sed s/\\\\\.//g)
Name: meka
Version: 0.73
Release: 4%{?dist}
Summary: Sega 8-bit machine emulator
Group: Applications/Emulators
License: MEKA and non-commercial
URL: http://www.smspower.org/meka/
Source0: http://www.smspower.org/meka/releases/%{name}-%{pkgdate}-srcs-v%{pkgversi...
Source1: %{name}.sh
Source2: %{name}.desktop
Patch0: %{name}-0.72-rpmopt.patch
Patch1: %{name}-0.72-buffer_overflow.patch
# http://www.smspower.org/forums/viewtopic.php?t=12699
Patch2: %{name}-0.73-execstack.patch
# http://www.smspower.org/forums/viewtopic.php?t=10848
# http://www.smspower.org/forums/viewtopic.php?t=12699
Patch3: %{name}-0.73-noseal.patch
# http://www.smspower.org/forums/viewtopic.php?t=12699
Patch4: %{name}-0.73-gcc45.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is package contains ix86 asm code
ExclusiveArch: i686
BuildRequires: allegro-devel
BuildRequires: nasm
BuildRequires: libpng-devel
BuildRequires: libXpm-devel
BuildRequires: libXxf86dga-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
%description
MEKA is a multi machine emulator, originally started as a Sega Master System
emulator, and generally very oriented toward Z80-based Sega 8-bit systems.
MEKA officially emulates the following systems:
- Sega Game 1000 / SG-1000 / Japan, Oceania
- Sega Computer 3000 / SC-3000 / Japan, Oceania, Europe
- Super Control Station / SF-7000 / Japan, Oceania, Europe
- Sega Mark III / MK3 / Japan
+ FM Unit Extension / MK3+FM / Japan
- Sega Master System / SMS / World Wide
- Sega Game Gear / GG / World Wide
- ColecoVision / COLECO / America, Europe
- Othello Multivision / OMV / Japan
You can play other systems on it only if you are smart enough to figure how.
And if you are, I doubt you will want to play Nintendo games. So forget it.
%prep
%setup -q -c
# Fix CFLAGS in Makefilie
%patch0 -p1
# Fix buffer overflows
%patch1 -p1
# Patch not to require an executable stack
%patch2 -p1
# Patch not to require libseal (audio is severly broken)
%patch3 -p1
# Patch to compile with gcc 4.5
%patch4 -p1
# Remove pre-built lib files
find -name '*.lib' -exec rm -f '{}' \;
# Fix end-of-line-encoding
sed -i 's/\r//' *.txt
# Fix char encondigs
for i in *.txt; do
iconv --from=ISO-8859-1 --to=UTF-8 $i > $i.utf8
mv $i.utf8 $i
done
%build
cd srcs
# make doesn't compile with %%{?_smp_mflags}
make RPMFLAGS="%{optflags}"
%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_bindir}
install -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/meka
install -d %{buildroot}/%{_libexecdir}/meka
install -m 755 meka %{buildroot}/%{_libexecdir}/meka
install -d %{buildroot}/%{_datadir}/meka
install -m 644 meka.{blt,dat,inp,msg,nam,pat,thm} %{buildroot}/%{_datadir}/meka
# install desktop file
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
# install icons
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32}/apps
convert -delete 1 srcs/mekaw.ico \
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
convert -delete 0 srcs/mekaw.ico \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%{_bindir}/meka
%{_libexecdir}/meka
%{_datadir}/meka
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%doc changes.txt compat.txt debugger.txt history.txt mekanix.txt
%doc meka.txt multi.txt sources.txt tech.txt TODO.txt
%changelog
* Sat Dec 11 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-4
- Fixed license
* Sat Dec 04 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-3
- Changed summary
- Removed pre-built lib files
- Fixed execstack patch
- Fixed consistent use of macros
- Minor changes
* Sat Nov 20 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-2
- Added a patch to compile with gcc4.5
* Sun Jun 13 2010 Andrea Musuruane <musuruan(a)gmail.com> 0.73-1
- New upstream release
* Thu Jul 30 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.73-0.1.20080619
- First release
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/meka/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Dec 2010 01:07:56 -0000 1.1
+++ .cvsignore 31 Dec 2010 18:34:01 -0000 1.2
@@ -0,0 +1 @@
+meka-2010-05-30-srcs-v073.zip
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/meka/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Dec 2010 01:07:56 -0000 1.1
+++ sources 31 Dec 2010 18:34:01 -0000 1.2
@@ -0,0 +1 @@
+15d7201bb3de0d2e4c4683be57e614bc meka-2010-05-30-srcs-v073.zip
13 years, 3 months
rpms/m2vmp2cut/F-14 m2vmp2cut.1, NONE, 1.1 m2vmp2cut.help-in-share.patch, NONE, 1.1 m2vmp2cut.libexec.patch, NONE, 1.1 m2vmp2cut.optflags.patch, NONE, 1.1 m2vmp2cut.spec, NONE, 1.1 m2vmp2cut.timestamps.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Göran Uddeborg
Author: goeran
Update of /cvs/free/rpms/m2vmp2cut/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9438/F-14
Modified Files:
.cvsignore sources
Added Files:
m2vmp2cut.1 m2vmp2cut.help-in-share.patch
m2vmp2cut.libexec.patch m2vmp2cut.optflags.patch
m2vmp2cut.spec m2vmp2cut.timestamps.patch
Log Message:
Importing m2vmp2cut in CVS for F-14.
--- NEW FILE m2vmp2cut.1 ---
.TH m2vmp2cut 1 2010-12-13
.SH NAME
m2vmp2cut \- MPEG2 frame accurate cutter
.SH SYNOPSIS
.B m2vmp2cut
.I command
.RI [ argument "... ]"
.SH DESCRIPTION
.B M2vmp2cut
is frame accurate (currently PAL) mpeg2 video (m2v file) with
accompanied mp2 audio (mp2 file) cutter.
Frame accuracy is achieved by re-encoding video around cutpoints.
Audio is cut from separate mp2 file at positions that keep a/v sync as
good as possible (maximum sync difference is around 10-15
milliseconds).
.TP
.B lvev6frames
Old versions of m2vmp2cut supported using lve-generated "edit lists"
for cutpoint information.
With lvev6frames these old edits can be used with this m2vmp2cut
version.
.TP
\fBdemux\fP [\fIfile\fP...]
.B M2vmp2cut
requires mpeg files to be demuxed to elementary streams before
cutting.
This command uses
.BR ProjectX (1)
to do the demuxing.
A separate directory (based on source filename) is created for output
files.
Note that this doubles the disk usage of a particular source file.
.TP
\fBselect\fP \fIdirectory\fP
This command uses new
.B m2vcut-gui
graphical utility for searching cutpoints.
This work is done frame-accurately.
.TP
\fBcut\fP \fIdirectory\fP [\fIoption\fP...]
This command is wrapper to m2vmp2cut.pl (which used to be the frontend
of m2vmp2cut in old versions).
This command has extensive help of it's own.
Note that this (again) adds one third of disk usage so far when this
creates final output file.
.TP
\fBplay\fP \fIdirectory\fP [\fIoption\fP...]
This command runs mplayer for the file created with cut command.
.TP
\fBmove\fP \fIdirectory\fP \fIdestfile\fP
Moves final output file to a new destination.
.TP
\fBgetyuv\fP [\fIdirectory\fP|\fBexamples\fP]
Decodes selected mpeg2 frames as a stream of yuv4mpeg pictures.
Useful for further encoding.
.TP
\fBgetmp2\fP [\fIdirectory\fP|\fBexamples\fP]
Extracts selected mp2 audio data, to be muxed with (re-encoded) video.
Mp2 data can be used as is, or as encoded to mp3 or vorbis.
.TP
.B help
Display help message.
.TP
.B contrib
Contribution material.
Mostly encoding scripts.
The command line interface of the programs these scripts invoke may
change over time \(em there is less quarantees that these work in
future than other
.B m2vmp2cut
functionality, in short term period.
m2vmp2cut.help-in-share.patch:
Makefile | 8 ++++----
bin/m2vmp2cut.pl | 2 +-
bin/wrapper.sh | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE m2vmp2cut.help-in-share.patch ---
--- bin/wrapper.sh~ 2009-01-24 12:04:23.000000000 +0100
+++ bin/wrapper.sh 2010-12-13 13:24:59.000000000 +0100
@@ -54,8 +54,8 @@
;;
m2vcut_outputhelp)
f=`echo $LANG |sed 's/[^A-Za-z_].*//'`
- pd=`cd \`dirname "$0"\`/..; pwd`
- helpprefix="$pd/doc/m2vcut_help"
+ pd=`cd \`dirname "$0"\`/../../..; pwd`
+ helpprefix="$pd/share/m2vmp2cut/m2vcut_help"
test -f "$helpprefix-$f" && cat "$helpprefix-$f" || cat "$helpprefix-default"
read line
;;
--- bin/m2vmp2cut.pl~ 2009-02-07 21:54:24.000000000 +0100
+++ bin/m2vmp2cut.pl 2010-12-13 13:24:55.000000000 +0100
@@ -43,7 +43,7 @@
open STDOUT, ">&STDERR" || warn "1>&2 redirection failed: $! !!!\n";
}
- system 'cat', "$M2VMP2CUT_CMD_PATH/../doc/$_[1]";
+ system 'cat', "$M2VMP2CUT_CMD_PATH/../../../share/m2vmp2cut/$_[1]";
exit $_[0];
}
--- Makefile~ 2010-12-13 12:05:16.000000000 +0100
+++ Makefile 2010-12-13 12:14:26.000000000 +0100
@@ -35,8 +35,8 @@
m2vmp2cut.pl m2vmp2cut.sh m2v_catfiltered.py m2v_somehdrinfo.py \
wrapper.sh lvev6frames.pl getyuv.pl getmp2.sh m2vmp2cut.pm
-#TRG_DOCS = Examples m2vcut_help-default m2vcut_help-fi_FI Options Usage
-TRG_DOCS = m2vcut_help-default m2vcut_help-fi_FI Options Usage
+TRG_DOCS = Examples m2vcut_help-default m2vcut_help-fi_FI Options Usage
+#TRG_DOCS = m2vcut_help-default m2vcut_help-fi_FI Options Usage
chkfiles: all
@for i in $(TRG_BINS:%=bin/%) $(TRG_DOCS:%=doc/%); \
@@ -48,10 +48,10 @@
@chkdir() { [ -d "$$1" ] || mkdir -m 755 -p "$$1"; }; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/doc; \
+ chkdir $(PREFIX)/share/m2vmp2cut; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
cp $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
- cp $(TRG_DOCS:%=doc/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/doc
+ cp $(TRG_DOCS:%=doc/%) $(PREFIX)/share/m2vmp2cut
cp contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut
@test x'$(PJXJAR)' = x || \
m2vmp2cut.libexec.patch:
Makefile | 12 ++++++------
m2vmp2cut | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE m2vmp2cut.libexec.patch ---
--- Makefile~ 2009-11-21 11:24:30.000000000 +0100
+++ Makefile 2010-12-11 23:20:17.000000000 +0100
@@ -44,15 +44,15 @@
@test -f m2vmp2cut
install: chkfiles chkprefix chkpjxjar
- @rm -rf $(PREFIX)/lib/m2vmp2cut-$(VER)
+ @rm -rf $(PREFIX)/libexec/m2vmp2cut-$(VER)
@chkdir() { [ -d "$$1" ] || mkdir -m 755 -p "$$1"; }; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/bin; \
+ chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \
+ chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin; \
chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/doc; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/contrib
- cp $(TRG_BINS:%=bin/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin
+ chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
+ cp $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
cp $(TRG_DOCS:%=doc/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/doc
- cp contrib/* $(PREFIX)/lib/m2vmp2cut-$(VER)/contrib
+ cp contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut
@test x'$(PJXJAR)' = x || \
ln -s $(PJXJAR) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin/ProjectX.jar
--- m2vmp2cut~ 2009-11-21 11:25:18.000000000 +0100
+++ m2vmp2cut 2010-12-12 10:47:55.000000000 +0100
@@ -19,11 +19,11 @@
case $dn in
*bin)
- c1="$dn/../lib/m2vmp2cut-$ver/bin/m2vmp2cut.sh"
+ c1="$dn/../libexec/m2vmp2cut-$ver/bin/m2vmp2cut.sh"
test -x "$c1" && exec "$c1" "$@" \
|| exec "$dn/bin/m2vmp2cut.sh" "$@" ;;
*)
c1="$dn/bin/m2vmp2cut.sh"
test -x "$c1" && exec "$c1" "$@" \
- || exec "$dn/../lib/m2vmp2cut-$ver/bin/m2vmp2cut.sh" "$@" ;;
+ || exec "$dn/../libexec/m2vmp2cut-$ver/bin/m2vmp2cut.sh" "$@" ;;
esac
m2vmp2cut.optflags.patch:
m2vcut-gui.c | 2 +-
m2vtoyuv.c | 2 +-
warpxpointer.c | 2 +-
wavgraph.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE m2vmp2cut.optflags.patch ---
--- src/m2vcut-gui.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/m2vcut-gui.c 2010-12-20 19:22:21.000000000 +0100
@@ -7,7 +7,7 @@
xo="`pkg-config --cflags --libs gtk+-2.0` -lutil $mpeg2_both"
xo="$xo -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
date=`date`; set -x
-${CC:-gcc} -ggdb -std=gnu99 $WARN "$@" -o "$TRG" "$0" $xo -DCDATE="\"$date\""
+${CC:-gcc} -ggdb -std=gnu99 $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" $xo -DCDATE="\"$date\""
# ${CC:-gcc} -O2 -std=c99 $WARN "$@" -o "$TRG" "$0" $xo -DCDATE="\"$date\""
exit 0
*/
--- src/m2vtoyuv.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/m2vtoyuv.c 2010-12-20 19:25:06.000000000 +0100
@@ -7,7 +7,7 @@
XF="$mpeg2_only -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
date=`date`; set -x
#${CC:-gcc} -ggdb $WARN "$@" -o "$TRG" "$0" $XF -DCDATE="\"$date\""
- ${CC:-gcc} -O2 $WARN "$@" -o "$TRG" "$0" $XF -DCDATE="\"$date\""
+ ${CC:-gcc} $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" $XF -DCDATE="\"$date\""
exit 0
*/
#endif
--- src/warpxpointer.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/warpxpointer.c 2010-12-20 19:23:22.000000000 +0100
@@ -5,7 +5,7 @@
WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion
date=`date`; set -x
#${CC:-gcc} -ggdb $WARN "$@" -o "$TRG" "$0" -DCDATE="\"$date\""
- ${CC:-gcc} -O2 $WARN "$@" -o "$TRG" "$0" -lX11 -DCDATE="\"$date\""
+ ${CC:-gcc} $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" -lX11 -DCDATE="\"$date\""
exit $?
*/
#endif
--- src/wavgraph.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/wavgraph.c 2010-12-20 19:22:50.000000000 +0100
@@ -5,7 +5,7 @@
WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion
date=`date`; set -x
#${CC:-gcc} -ggdb -std=gnu99 $WARN "$@" -o "$TRG" "$0" -DCDATE="\"$date\""
- ${CC:-gcc} -O2 -std=gnu99 $WARN "$@" -o "$TRG" "$0" obj_b/x.o
+ ${CC:-gcc} -std=gnu99 $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" obj_b/x.o
exit $?
*/
#endif
--- NEW FILE m2vmp2cut.spec ---
Name: m2vmp2cut
Version: 0.79
Release: 5%{?dist}
Summary: MPEG2 frame accurate cutter
Summary(sv): MPEG2 bildprecis redigerare
Group: Applications/Multimedia
License: GPLv2
URL: http://www.guru-group.fi/~too/sw/%{name}/
Source0: http://www.guru-group.fi/~too/sw/%{name}/%{name}-%{version}-dev.tar.gz
Source1: %{name}.1
Patch0: %{name}.optflags.patch
Patch1: %{name}.libexec.patch
Patch2: %{name}.help-in-share.patch
Patch3: %{name}.timestamps.patch
BuildRequires: libtool
BuildRequires: gtk2-devel
BuildRequires: libmpeg2-devel
Requires: ProjectX
Requires: mjpegtools
Requires: python
Requires: xterm
Requires: bash
Requires: libmpeg2 >= 0.5.1
Requires: transcode
%filter_from_requires /perl(m2vmp2cut)/d
%filter_setup
%description
m2vmp2cut is frame accurate (currently PAL) mpeg2 video (m2v file)
with accompanied mp2 audio (mp2 file) cutter.
Frame accuracy is achieved by re-encoding video around cutpoints.
Audio is cut from separate mp2 file at positions that keep a/v sync as
good as possible (maximum sync difference is around 10-15
milliseconds).
%description -l sv
m2vmp2cut är ett bildprecist redigeringsprogram för mpeg2 video (för
närvarande PAL, m2v-fil) med tillhörande mp2-audio (mp2-fil).
Bildprecision åstadkoms med omkodning av video runt snittpunkter.
Audio klipps från en separat mp2-fil på positions som håller
a/v-synkroniseringen så bra som möjligt (maximal synkroniseringskillnad
är runt 10-15 millisekunder).
%prep
%setup -q -n %{name}-%{version}-dev
# Insert optimizer flags where needed
%patch0
# Put helper programs in libexec
%patch1
# Put help files in /usr/share
%patch2
# Preserve timestamps when installing
%patch3
%build
unset CCACHE_UMASK
make %{?_smp_mflags} CFLAGS='%{optflags} $(LF_OPTS)'
%install
# Put a dummy projectx in the path. At run time, the real projectx
# script will be used. With this trick we do not have to have
# ProjectX as a BuildRequires.
mkdir dummybin
touch dummybin/projectx
chmod +x dummybin/projectx
PATH=$(pwd)/dummybin:$PATH make install PREFIX=%{buildroot}%{_prefix}
mkdir -p %{buildroot}%{_mandir}/man1
cp -p %{SOURCE1} %{buildroot}%{_mandir}/man1
%files
%defattr(-,root,root,-)
%doc ANNOUNCE COPYING HISTORY README TODO
%{_bindir}/%{name}
%{_libexecdir}/%{name}-%{version}-dev
%{_datadir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%changelog
* Mon Dec 27 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-5
- Simplify optimization patch, by not modifying the makefile where it only
does linking.
* Mon Dec 20 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-4
- Let rpm's optflags OVERRIDE rather than ADD TO the upstreams flags.
- Unset CCACHE_UMASK to avoid getting group writable binaries.
* Mon Dec 13 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-3
- Compile with optflags.
- Require transcode, it is strongly recommended even if not strictly required.
- License is GPLv2 only.
- Use a separate patch file to put helper programs in libexec.
- Put help files in /usr/share.
- Remove obsolete unused macro definitions.
- Filter perl requirements according to updated recommendations.
- Add disttag.
- Require the package xterm rather than the uxterm binary.
- Preserve timestamps when installing files.
- Add braces around variables.
- Include a simple manual pages, based on "m2vmp2cut help ."
* Sun Sep 19 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-2
- Added COPYING and doc/Examples to the documentation.
- Changed to "global" in definition of __perl_requires.
- Create a dummy projectx in the path, to avoid having ProjectX as a
build requirement.
* Thu Apr 8 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-1
- Version 0.79.
- SPEC file updated to match Fedora packaging standards.
* Tue Feb 10 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.77-1
- Version 0.77 with fix for an A/V sync problem.
* Sat Feb 7 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.76-2
- Add missing perl quote in m2vmp2cut.pl
* Sat Feb 7 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.76-1
- Bump to new version.
* Tue Sep 9 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.72-2
- Patch for sync problem.
* Sun Aug 17 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.72-1
- Version bump
- Fix for offset type bug
* Mon Jul 28 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.68-1
- First RPM packaging
m2vmp2cut.timestamps.patch:
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE m2vmp2cut.timestamps.patch ---
--- Makefile~ 2010-12-13 14:08:29.000000000 +0100
+++ Makefile 2010-12-13 14:37:33.000000000 +0100
@@ -50,10 +50,10 @@
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin; \
chkdir $(PREFIX)/share/m2vmp2cut; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
- cp $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
- cp $(TRG_DOCS:%=doc/%) $(PREFIX)/share/m2vmp2cut
- cp contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
- cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut
+ cp -p $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
+ cp -p $(TRG_DOCS:%=doc/%) $(PREFIX)/share/m2vmp2cut
+ cp -p contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
+ cp -p m2vmp2cut $(PREFIX)/bin/m2vmp2cut
@test x'$(PJXJAR)' = x || \
ln -s $(PJXJAR) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin/ProjectX.jar
# v=$(VER); sed "s/=devel/=$$v/" m2vmp2cut > $(PREFIX)/bin/m2vmp2cut
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/F-14/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Dec 2010 11:26:21 -0000 1.1
+++ .cvsignore 30 Dec 2010 18:11:16 -0000 1.2
@@ -0,0 +1 @@
+m2vmp2cut-0.79-dev.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/F-14/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Dec 2010 11:26:21 -0000 1.1
+++ sources 30 Dec 2010 18:11:16 -0000 1.2
@@ -0,0 +1 @@
+9eb1e0455fa803b5f0cba34270532839 m2vmp2cut-0.79-dev.tar.gz
13 years, 3 months
rpms/m2vmp2cut/devel m2vmp2cut.1, NONE, 1.1 m2vmp2cut.help-in-share.patch, NONE, 1.1 m2vmp2cut.libexec.patch, NONE, 1.1 m2vmp2cut.optflags.patch, NONE, 1.1 m2vmp2cut.spec, NONE, 1.1 m2vmp2cut.timestamps.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Göran Uddeborg
Author: goeran
Update of /cvs/free/rpms/m2vmp2cut/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8798/devel
Modified Files:
.cvsignore sources
Added Files:
m2vmp2cut.1 m2vmp2cut.help-in-share.patch
m2vmp2cut.libexec.patch m2vmp2cut.optflags.patch
m2vmp2cut.spec m2vmp2cut.timestamps.patch
Log Message:
Importing m2vmp2cut in CVS.
--- NEW FILE m2vmp2cut.1 ---
.TH m2vmp2cut 1 2010-12-13
.SH NAME
m2vmp2cut \- MPEG2 frame accurate cutter
.SH SYNOPSIS
.B m2vmp2cut
.I command
.RI [ argument "... ]"
.SH DESCRIPTION
.B M2vmp2cut
is frame accurate (currently PAL) mpeg2 video (m2v file) with
accompanied mp2 audio (mp2 file) cutter.
Frame accuracy is achieved by re-encoding video around cutpoints.
Audio is cut from separate mp2 file at positions that keep a/v sync as
good as possible (maximum sync difference is around 10-15
milliseconds).
.TP
.B lvev6frames
Old versions of m2vmp2cut supported using lve-generated "edit lists"
for cutpoint information.
With lvev6frames these old edits can be used with this m2vmp2cut
version.
.TP
\fBdemux\fP [\fIfile\fP...]
.B M2vmp2cut
requires mpeg files to be demuxed to elementary streams before
cutting.
This command uses
.BR ProjectX (1)
to do the demuxing.
A separate directory (based on source filename) is created for output
files.
Note that this doubles the disk usage of a particular source file.
.TP
\fBselect\fP \fIdirectory\fP
This command uses new
.B m2vcut-gui
graphical utility for searching cutpoints.
This work is done frame-accurately.
.TP
\fBcut\fP \fIdirectory\fP [\fIoption\fP...]
This command is wrapper to m2vmp2cut.pl (which used to be the frontend
of m2vmp2cut in old versions).
This command has extensive help of it's own.
Note that this (again) adds one third of disk usage so far when this
creates final output file.
.TP
\fBplay\fP \fIdirectory\fP [\fIoption\fP...]
This command runs mplayer for the file created with cut command.
.TP
\fBmove\fP \fIdirectory\fP \fIdestfile\fP
Moves final output file to a new destination.
.TP
\fBgetyuv\fP [\fIdirectory\fP|\fBexamples\fP]
Decodes selected mpeg2 frames as a stream of yuv4mpeg pictures.
Useful for further encoding.
.TP
\fBgetmp2\fP [\fIdirectory\fP|\fBexamples\fP]
Extracts selected mp2 audio data, to be muxed with (re-encoded) video.
Mp2 data can be used as is, or as encoded to mp3 or vorbis.
.TP
.B help
Display help message.
.TP
.B contrib
Contribution material.
Mostly encoding scripts.
The command line interface of the programs these scripts invoke may
change over time \(em there is less quarantees that these work in
future than other
.B m2vmp2cut
functionality, in short term period.
m2vmp2cut.help-in-share.patch:
Makefile | 8 ++++----
bin/m2vmp2cut.pl | 2 +-
bin/wrapper.sh | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE m2vmp2cut.help-in-share.patch ---
--- bin/wrapper.sh~ 2009-01-24 12:04:23.000000000 +0100
+++ bin/wrapper.sh 2010-12-13 13:24:59.000000000 +0100
@@ -54,8 +54,8 @@
;;
m2vcut_outputhelp)
f=`echo $LANG |sed 's/[^A-Za-z_].*//'`
- pd=`cd \`dirname "$0"\`/..; pwd`
- helpprefix="$pd/doc/m2vcut_help"
+ pd=`cd \`dirname "$0"\`/../../..; pwd`
+ helpprefix="$pd/share/m2vmp2cut/m2vcut_help"
test -f "$helpprefix-$f" && cat "$helpprefix-$f" || cat "$helpprefix-default"
read line
;;
--- bin/m2vmp2cut.pl~ 2009-02-07 21:54:24.000000000 +0100
+++ bin/m2vmp2cut.pl 2010-12-13 13:24:55.000000000 +0100
@@ -43,7 +43,7 @@
open STDOUT, ">&STDERR" || warn "1>&2 redirection failed: $! !!!\n";
}
- system 'cat', "$M2VMP2CUT_CMD_PATH/../doc/$_[1]";
+ system 'cat', "$M2VMP2CUT_CMD_PATH/../../../share/m2vmp2cut/$_[1]";
exit $_[0];
}
--- Makefile~ 2010-12-13 12:05:16.000000000 +0100
+++ Makefile 2010-12-13 12:14:26.000000000 +0100
@@ -35,8 +35,8 @@
m2vmp2cut.pl m2vmp2cut.sh m2v_catfiltered.py m2v_somehdrinfo.py \
wrapper.sh lvev6frames.pl getyuv.pl getmp2.sh m2vmp2cut.pm
-#TRG_DOCS = Examples m2vcut_help-default m2vcut_help-fi_FI Options Usage
-TRG_DOCS = m2vcut_help-default m2vcut_help-fi_FI Options Usage
+TRG_DOCS = Examples m2vcut_help-default m2vcut_help-fi_FI Options Usage
+#TRG_DOCS = m2vcut_help-default m2vcut_help-fi_FI Options Usage
chkfiles: all
@for i in $(TRG_BINS:%=bin/%) $(TRG_DOCS:%=doc/%); \
@@ -48,10 +48,10 @@
@chkdir() { [ -d "$$1" ] || mkdir -m 755 -p "$$1"; }; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/doc; \
+ chkdir $(PREFIX)/share/m2vmp2cut; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
cp $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
- cp $(TRG_DOCS:%=doc/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/doc
+ cp $(TRG_DOCS:%=doc/%) $(PREFIX)/share/m2vmp2cut
cp contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut
@test x'$(PJXJAR)' = x || \
m2vmp2cut.libexec.patch:
Makefile | 12 ++++++------
m2vmp2cut | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE m2vmp2cut.libexec.patch ---
--- Makefile~ 2009-11-21 11:24:30.000000000 +0100
+++ Makefile 2010-12-11 23:20:17.000000000 +0100
@@ -44,15 +44,15 @@
@test -f m2vmp2cut
install: chkfiles chkprefix chkpjxjar
- @rm -rf $(PREFIX)/lib/m2vmp2cut-$(VER)
+ @rm -rf $(PREFIX)/libexec/m2vmp2cut-$(VER)
@chkdir() { [ -d "$$1" ] || mkdir -m 755 -p "$$1"; }; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/bin; \
+ chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \
+ chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin; \
chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/doc; \
- chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/contrib
- cp $(TRG_BINS:%=bin/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin
+ chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
+ cp $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
cp $(TRG_DOCS:%=doc/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/doc
- cp contrib/* $(PREFIX)/lib/m2vmp2cut-$(VER)/contrib
+ cp contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut
@test x'$(PJXJAR)' = x || \
ln -s $(PJXJAR) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin/ProjectX.jar
--- m2vmp2cut~ 2009-11-21 11:25:18.000000000 +0100
+++ m2vmp2cut 2010-12-12 10:47:55.000000000 +0100
@@ -19,11 +19,11 @@
case $dn in
*bin)
- c1="$dn/../lib/m2vmp2cut-$ver/bin/m2vmp2cut.sh"
+ c1="$dn/../libexec/m2vmp2cut-$ver/bin/m2vmp2cut.sh"
test -x "$c1" && exec "$c1" "$@" \
|| exec "$dn/bin/m2vmp2cut.sh" "$@" ;;
*)
c1="$dn/bin/m2vmp2cut.sh"
test -x "$c1" && exec "$c1" "$@" \
- || exec "$dn/../lib/m2vmp2cut-$ver/bin/m2vmp2cut.sh" "$@" ;;
+ || exec "$dn/../libexec/m2vmp2cut-$ver/bin/m2vmp2cut.sh" "$@" ;;
esac
m2vmp2cut.optflags.patch:
m2vcut-gui.c | 2 +-
m2vtoyuv.c | 2 +-
warpxpointer.c | 2 +-
wavgraph.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE m2vmp2cut.optflags.patch ---
--- src/m2vcut-gui.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/m2vcut-gui.c 2010-12-20 19:22:21.000000000 +0100
@@ -7,7 +7,7 @@
xo="`pkg-config --cflags --libs gtk+-2.0` -lutil $mpeg2_both"
xo="$xo -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
date=`date`; set -x
-${CC:-gcc} -ggdb -std=gnu99 $WARN "$@" -o "$TRG" "$0" $xo -DCDATE="\"$date\""
+${CC:-gcc} -ggdb -std=gnu99 $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" $xo -DCDATE="\"$date\""
# ${CC:-gcc} -O2 -std=c99 $WARN "$@" -o "$TRG" "$0" $xo -DCDATE="\"$date\""
exit 0
*/
--- src/m2vtoyuv.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/m2vtoyuv.c 2010-12-20 19:25:06.000000000 +0100
@@ -7,7 +7,7 @@
XF="$mpeg2_only -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
date=`date`; set -x
#${CC:-gcc} -ggdb $WARN "$@" -o "$TRG" "$0" $XF -DCDATE="\"$date\""
- ${CC:-gcc} -O2 $WARN "$@" -o "$TRG" "$0" $XF -DCDATE="\"$date\""
+ ${CC:-gcc} $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" $XF -DCDATE="\"$date\""
exit 0
*/
#endif
--- src/warpxpointer.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/warpxpointer.c 2010-12-20 19:23:22.000000000 +0100
@@ -5,7 +5,7 @@
WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion
date=`date`; set -x
#${CC:-gcc} -ggdb $WARN "$@" -o "$TRG" "$0" -DCDATE="\"$date\""
- ${CC:-gcc} -O2 $WARN "$@" -o "$TRG" "$0" -lX11 -DCDATE="\"$date\""
+ ${CC:-gcc} $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" -lX11 -DCDATE="\"$date\""
exit $?
*/
#endif
--- src/wavgraph.c~ 2009-01-24 12:04:23.000000000 +0100
+++ src/wavgraph.c 2010-12-20 19:22:50.000000000 +0100
@@ -5,7 +5,7 @@
WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion
date=`date`; set -x
#${CC:-gcc} -ggdb -std=gnu99 $WARN "$@" -o "$TRG" "$0" -DCDATE="\"$date\""
- ${CC:-gcc} -O2 -std=gnu99 $WARN "$@" -o "$TRG" "$0" obj_b/x.o
+ ${CC:-gcc} -std=gnu99 $RPM_OPT_FLAGS "$@" -o "$TRG" "$0" obj_b/x.o
exit $?
*/
#endif
--- NEW FILE m2vmp2cut.spec ---
Name: m2vmp2cut
Version: 0.79
Release: 5%{?dist}
Summary: MPEG2 frame accurate cutter
Summary(sv): MPEG2 bildprecis redigerare
Group: Applications/Multimedia
License: GPLv2
URL: http://www.guru-group.fi/~too/sw/%{name}/
Source0: http://www.guru-group.fi/~too/sw/%{name}/%{name}-%{version}-dev.tar.gz
Source1: %{name}.1
Patch0: %{name}.optflags.patch
Patch1: %{name}.libexec.patch
Patch2: %{name}.help-in-share.patch
Patch3: %{name}.timestamps.patch
BuildRequires: libtool
BuildRequires: gtk2-devel
BuildRequires: libmpeg2-devel
Requires: ProjectX
Requires: mjpegtools
Requires: python
Requires: xterm
Requires: bash
Requires: libmpeg2 >= 0.5.1
Requires: transcode
%filter_from_requires /perl(m2vmp2cut)/d
%filter_setup
%description
m2vmp2cut is frame accurate (currently PAL) mpeg2 video (m2v file)
with accompanied mp2 audio (mp2 file) cutter.
Frame accuracy is achieved by re-encoding video around cutpoints.
Audio is cut from separate mp2 file at positions that keep a/v sync as
good as possible (maximum sync difference is around 10-15
milliseconds).
%description -l sv
m2vmp2cut är ett bildprecist redigeringsprogram för mpeg2 video (för
närvarande PAL, m2v-fil) med tillhörande mp2-audio (mp2-fil).
Bildprecision åstadkoms med omkodning av video runt snittpunkter.
Audio klipps från en separat mp2-fil på positions som håller
a/v-synkroniseringen så bra som möjligt (maximal synkroniseringskillnad
är runt 10-15 millisekunder).
%prep
%setup -q -n %{name}-%{version}-dev
# Insert optimizer flags where needed
%patch0
# Put helper programs in libexec
%patch1
# Put help files in /usr/share
%patch2
# Preserve timestamps when installing
%patch3
%build
unset CCACHE_UMASK
make %{?_smp_mflags} CFLAGS='%{optflags} $(LF_OPTS)'
%install
# Put a dummy projectx in the path. At run time, the real projectx
# script will be used. With this trick we do not have to have
# ProjectX as a BuildRequires.
mkdir dummybin
touch dummybin/projectx
chmod +x dummybin/projectx
PATH=$(pwd)/dummybin:$PATH make install PREFIX=%{buildroot}%{_prefix}
mkdir -p %{buildroot}%{_mandir}/man1
cp -p %{SOURCE1} %{buildroot}%{_mandir}/man1
%files
%defattr(-,root,root,-)
%doc ANNOUNCE COPYING HISTORY README TODO
%{_bindir}/%{name}
%{_libexecdir}/%{name}-%{version}-dev
%{_datadir}/%{name}
%{_mandir}/man1/%{name}.1.gz
%changelog
* Mon Dec 27 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-5
- Simplify optimization patch, by not modifying the makefile where it only
does linking.
* Mon Dec 20 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-4
- Let rpm's optflags OVERRIDE rather than ADD TO the upstreams flags.
- Unset CCACHE_UMASK to avoid getting group writable binaries.
* Mon Dec 13 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-3
- Compile with optflags.
- Require transcode, it is strongly recommended even if not strictly required.
- License is GPLv2 only.
- Use a separate patch file to put helper programs in libexec.
- Put help files in /usr/share.
- Remove obsolete unused macro definitions.
- Filter perl requirements according to updated recommendations.
- Add disttag.
- Require the package xterm rather than the uxterm binary.
- Preserve timestamps when installing files.
- Add braces around variables.
- Include a simple manual pages, based on "m2vmp2cut help ."
* Sun Sep 19 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-2
- Added COPYING and doc/Examples to the documentation.
- Changed to "global" in definition of __perl_requires.
- Create a dummy projectx in the path, to avoid having ProjectX as a
build requirement.
* Thu Apr 8 2010 Göran Uddeborg <goeran(a)uddeborg.se> 0.79-1
- Version 0.79.
- SPEC file updated to match Fedora packaging standards.
* Tue Feb 10 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.77-1
- Version 0.77 with fix for an A/V sync problem.
* Sat Feb 7 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.76-2
- Add missing perl quote in m2vmp2cut.pl
* Sat Feb 7 2009 Göran Uddeborg <goeran(a)uddeborg.se> 0.76-1
- Bump to new version.
* Tue Sep 9 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.72-2
- Patch for sync problem.
* Sun Aug 17 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.72-1
- Version bump
- Fix for offset type bug
* Mon Jul 28 2008 Göran Uddeborg <goeran(a)uddeborg.se> 0.68-1
- First RPM packaging
m2vmp2cut.timestamps.patch:
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE m2vmp2cut.timestamps.patch ---
--- Makefile~ 2010-12-13 14:08:29.000000000 +0100
+++ Makefile 2010-12-13 14:37:33.000000000 +0100
@@ -50,10 +50,10 @@
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin; \
chkdir $(PREFIX)/share/m2vmp2cut; \
chkdir $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
- cp $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
- cp $(TRG_DOCS:%=doc/%) $(PREFIX)/share/m2vmp2cut
- cp contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
- cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut
+ cp -p $(TRG_BINS:%=bin/%) $(PREFIX)/libexec/m2vmp2cut-$(VER)/bin
+ cp -p $(TRG_DOCS:%=doc/%) $(PREFIX)/share/m2vmp2cut
+ cp -p contrib/* $(PREFIX)/libexec/m2vmp2cut-$(VER)/contrib
+ cp -p m2vmp2cut $(PREFIX)/bin/m2vmp2cut
@test x'$(PJXJAR)' = x || \
ln -s $(PJXJAR) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin/ProjectX.jar
# v=$(VER); sed "s/=devel/=$$v/" m2vmp2cut > $(PREFIX)/bin/m2vmp2cut
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Dec 2010 11:26:21 -0000 1.1
+++ .cvsignore 30 Dec 2010 18:06:48 -0000 1.2
@@ -0,0 +1 @@
+m2vmp2cut-0.79-dev.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/m2vmp2cut/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Dec 2010 11:26:21 -0000 1.1
+++ sources 30 Dec 2010 18:06:48 -0000 1.2
@@ -0,0 +1 @@
+9eb1e0455fa803b5f0cba34270532839 m2vmp2cut-0.79-dev.tar.gz
13 years, 3 months
rpms/m2vmp2cut/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/m2vmp2cut/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsk15098/rpms/m2vmp2cut/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module m2vmp2cut
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: m2vmp2cut
# $Id: Makefile,v 1.1 2010/12/30 11:26:21 kwizart Exp $
NAME := m2vmp2cut
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 ---
13 years, 3 months
rpms/m2vmp2cut Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/m2vmp2cut
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsk15098/rpms/m2vmp2cut
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module m2vmp2cut
--- NEW FILE Makefile ---
# Top level Makefile for module m2vmp2cut
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 ---
13 years, 3 months
rpms/m2vmp2cut/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/m2vmp2cut/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsk15098/rpms/m2vmp2cut/devel
Log Message:
Directory /cvs/free/rpms/m2vmp2cut/devel added to the repository
13 years, 3 months
rpms/m2vmp2cut - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/m2vmp2cut
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsk15098/rpms/m2vmp2cut
Log Message:
Directory /cvs/free/rpms/m2vmp2cut added to the repository
13 years, 3 months
rpms/xorg-x11-drv-catalyst/F-14 catalyst-config-display, 1.1, 1.2 xorg-x11-drv-catalyst.spec, 1.2, 1.3
by Stewart Adam
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28076
Modified Files:
catalyst-config-display xorg-x11-drv-catalyst.spec
Log Message:
* Wed Dec 29 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-2
- Fix semantic errors in catalyst-config-display that caused tracebacks on F-14
- Remove VideoOverlay from xorg.conf as it is no longer used by the driver
Index: catalyst-config-display
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/catalyst-config-display,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalyst-config-display 6 May 2009 20:01:21 -0000 1.1
+++ catalyst-config-display 29 Dec 2010 05:45:59 -0000 1.2
@@ -16,9 +16,9 @@
# Copyright 2003, 2004 Peter Backlund
# Copyright 2004 Thorsten Leemhuis
# Copyright 2006, 2007 Van Assche Alphonse
-# Copyright 2006-2009 Stewart Adam
+# Copyright 2006-2010 Stewart Adam
-# internal revision: 2.0
+# internal revision: 2.1
import os
import sys
@@ -82,8 +82,8 @@
if currentDriver != self.majorVendor:
self.config.setOldDriver(currentDriver)
self.toggleDriver(currentDriver, self.majorVendor)
- self.addOption(self.majorVendor,"OpenGLOverlay" ,"off")
- self.addOption(self.majorVendor,"VideoOverlay" ,"on")
+ self.addOption(self.majorVendor, "OpenGLOverlay", "off")
+ self.removeOption(self.majorVendor, "VideoOverlay")
if self.xconfig.modules:
for module in ["glx", "dri", "extmod"]:
if self.onlyHasModule(module):
@@ -97,7 +97,7 @@
x86_64Content = "/usr/lib/catalyst\n/usr/lib64/catalyst\n"
Utils.writeFile(self.ldconf, x86_64Content)
else:
- Utils.writeFile(self.ldconf,"/usr/lib/catalyst\n")
+ Utils.writeFile(self.ldconf, "/usr/lib/catalyst\n")
print _('Running ldconfig, this could take some time...')
Utils.runLdconfig()
Utils.writeXorgConf(self.xconfig, self.xconfigpath)
@@ -121,8 +121,8 @@
print _('Using the \'radeon\' driver instead.')
prevDriver = "radeon"
self.config.setOldDriver("radeon")
- self.removeOption(self.majorVendor,"OpenGLOverlay")
- self.removeOption(self.majorVendor,"VideoOverlay")
+ self.removeOption(self.majorVendor, "OpenGLOverlay")
+ self.removeOption(self.majorVendor, "VideoOverlay")
self.toggleDriver(self.majorVendor, prevDriver)
# Let's give control back to the naitive DRI
Utils.removeFile(self.ldconf)
@@ -140,7 +140,7 @@
"""Runs the appropriate autoconfiguation function"""
# Check number of arguments
# arg = action
- if len(sys.argv) > 2:
+ if len(sys.argv) != 2:
print _('Wrong number of arguments')
self.printUsage()
sys.exit(1)
@@ -159,7 +159,7 @@
elif arg == "disable":
if self.getActive():
self.disable()
- except error, errMsg:
+ except Exception, errMsg:
#raise # Uncomment me to show the real error
print MSG_CONF_APPLY_ERROR
try:
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-catalyst.spec 26 Dec 2010 21:42:07 -0000 1.2
+++ xorg-x11-drv-catalyst.spec 29 Dec 2010 05:46:00 -0000 1.3
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-catalyst
Version: 10.12
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
@@ -329,6 +329,10 @@
%{_includedir}/fglrx/
%changelog
+* Wed Dec 29 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-2
+- Fix semantic errors in catalyst-config-display that caused tracebacks on F-14
+- Remove VideoOverlay from xorg.conf as it is no longer used by the driver
+
* Sun Dec 26 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-1
- Update to Catalyst 10.12 (internal version 8.80.1)
- Merge changes from F-13 branch
13 years, 4 months