rpms/mess/F-13 mess-fortify.patch, NONE, 1.1 mess-verbosebuild.patch, NONE, 1.1 mess.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12581
Modified Files:
.cvsignore sources
Added Files:
mess-fortify.patch mess-verbosebuild.patch mess.spec
Log Message:
Initial import
mess-fortify.patch:
sdlprefix.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE mess-fortify.patch ---
diff -up mame-0.137/src/osd/sdl/sdlprefix.h.fortify mame-0.137/src/osd/sdl/sdlprefix.h
--- mame-0.137/src/osd/sdl/sdlprefix.h.fortify 2010-03-21 14:20:41.000000000 +0100
+++ mame-0.137/src/osd/sdl/sdlprefix.h 2010-03-21 14:21:07.000000000 +0100
@@ -50,9 +50,9 @@
#endif
// fix for Ubuntu 8.10
-#ifdef _FORTIFY_SOURCE
-#undef _FORTIFY_SOURCE
-#endif
+// #ifdef _FORTIFY_SOURCE
+// #undef _FORTIFY_SOURCE
+// #endif
#endif /* SDLMAME_UNIX */
mess-verbosebuild.patch:
makefile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE mess-verbosebuild.patch ---
diff -up mame-0.137/makefile.verbosebuild mame-0.137/makefile
--- mame-0.137/makefile.verbosebuild 2010-03-21 15:38:37.000000000 +0100
+++ mame-0.137/makefile 2010-03-21 15:40:09.000000000 +0100
@@ -268,11 +268,11 @@ BUILD_EXE = $(EXE)
endif
# compiler, linker and utilities
-AR = @ar
-CC = @gcc
-LD = @g++
+AR = ar
+CC = gcc
+LD = g++
MD = -mkdir$(EXE)
-RM = @rm -f
+RM = rm -f
@@ -688,12 +688,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
$(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR)
@echo Converting $<...
- @$(FILE2STR) $< $@ layout_$(basename $(notdir $<))
+ $(FILE2STR) $< $@ layout_$(basename $(notdir $<))
$(OBJ)/%.fh: $(SRC)/%.png $(PNG2BDC) $(FILE2STR)
@echo Converting $<...
- @$(PNG2BDC) $< $(OBJ)/temp.bdc
- @$(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
+ $(PNG2BDC) $< $(OBJ)/temp.bdc
+ $(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
$(OBJ)/%.a:
@echo Archiving $@...
--- NEW FILE mess.spec ---
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
%global baseversion 138
Name: mess
Version: 0.%{baseversion}
Release: 2%{?dist}
Summary: Multiple Emulator Super System
Group: Applications/Emulators
#Files in src/lib/util and src/osd (except src/osd/sdl) are BSD
License: MAME License
URL: http://www.mess.org/
Source0: http://www.aarongiles.com/mirror/releases/mame0%{baseversion}s.exe
Source1: http://www.mess.org/files/%{name}0%{baseversion}s.zip
Source2: ctrlr.rar
#ui.bdc generated from ui.bdf
#Source2: ui.bdc
Patch0: %{name}-fortify.patch
Patch1: %{name}-verbosebuild.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: expat-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
BuildRequires: p7zip
BuildRequires: SDL-devel
BuildRequires: unrar
BuildRequires: zlib-devel
Provides: sdlmess = 0%{baseversion}-%{release}
Obsoletes: sdlmess < 0136-2
%description
MESS is an acronym that stands for Multiple Emulator Super System. MESS will
more or less faithfully reproduce computer and console systems on a PC.
MESS emulates the hardware of the systems and sometimes utilizes ROM images to
load programs and games. Therefore, these systems are NOT simulations, but
the actual emulations of the hardware.
%package tools
Summary: Tools used for the MESS package
Group: Applications/Emulators
Requires: %{name} = %{version}-%{release}
Provides: sdlmess-tools = 0%{baseversion}-%{release}
Obsoletes: sdlmess-tools < 0136-2
%description tools
%{summary}.
%package data
Summary: Data files used for the MESS package
Group: Applications/Emulators
Requires: %{name} = %{version}-%{release}
Provides: sdlmess-data = 0%{baseversion}-%{release}
Obsoletes: sdlmess-data < 0136-2
BuildArch: noarch
%description data
%{summary}.
%prep
%setup -qcT
7za x %{SOURCE0}
find . -type f -not -name uismall.png -exec sed -i 's/\r//' {} \;
unzip -o %{SOURCE1}
%patch0 -p1 -b .fortify
%patch1 -p1 -b .verbosebuild
# Remove windows-specific documentation
rm -fr docs/win*
# Move the imgtool documentation to the top dir for better visibility
mv docs/imgtool.txt .
# Fix permissions
chmod 644 docs/config.txt docs/credits.htm docs/license.txt docs/mame.txt docs/newvideo.txt
find src/mess -type f \( -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
chmod 644 src/mame/machine/snescx4.h
# Fix newvideo.txt encoding
pushd docs
/usr/bin/iconv -f cp1250 -t utf-8 newvideo.txt > newvideo.txt.conv
/bin/mv -f newvideo.txt.conv newvideo.txt
popd
# Create ini file
cat > %{name}.ini << EOF
# Define multi-user paths
artpath %{_datadir}/%{name}/artwork;%{_datadir}/%{name}/effects
ctrlrpath %{_datadir}/%{name}/ctrlr
fontpath %{_datadir}/%{name}/fonts
hashpath %{_datadir}/%{name}/hash
rompath %{_datadir}/%{name}/roms
samplepath %{_datadir}/%{name}/samples
cheatpath %{_datadir}/%{name}/cheats
# Allow user to override ini settings
inipath \$HOME/.%{name}/ini;%{_sysconfdir}/%{name}
# Set paths for local storage
cfg_directory \$HOME/.%{name}/cfg
comment_directory \$HOME/.%{name}/comments
diff_directory \$HOME/.%{name}/diff
input_directory \$HOME/.%{name}/inp
memcard_directory \$HOME/.%{name}/memcard
nvram_directory \$HOME/.%{name}/nvram
snapshot_directory \$HOME/.%{name}/snap
state_directory \$HOME/.%{name}/sta
# Fedora custom defaults
video opengl
autosave 1
joystick 1
EOF
%build
%if %{with debug}
make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' DEBUG=1 all TARGET=mess
%else
make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' all TARGET=mess
%endif
%install
rm -rf %{buildroot}
# create directories
install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_datadir}/%{name}/artwork
install -d %{buildroot}%{_datadir}/%{name}/roms
install -d %{buildroot}%{_datadir}/%{name}/ctrlr
install -d %{buildroot}%{_datadir}/%{name}/fonts
install -d %{buildroot}%{_datadir}/%{name}/hash
install -d %{buildroot}%{_datadir}/%{name}/samples
install -d %{buildroot}%{_datadir}/%{name}/software
install -d %{buildroot}%{_datadir}/%{name}/cheats
install -d %{buildroot}%{_sysconfdir}/%{name}
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/diff
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/ini
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/inp
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/memcard
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/nvram
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/sta
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/snap
# Install binaries and config files
%if %{with debug}
install -pm 755 %{name}d %{buildroot}%{_bindir}
%else
install -pm 755 %{name} %{buildroot}%{_bindir}
%endif
install -pm 755 castool dat2html imgtool messtest %{buildroot}%{_bindir}
install -pm 644 sysinfo.dat %{buildroot}%{_datadir}/%{name}
install -pm 644 artwork/* %{buildroot}%{_datadir}/%{name}/artwork
#install -pm 644 ui.bdf %{SOURCE2} %{buildroot}%{_datadir}/%{name}/fonts
install -pm 644 hash/* %{buildroot}%{_datadir}/%{name}/hash
install -pm 644 %{name}.ini %{buildroot}%{_sysconfdir}/%{name}
# Install controller files
unrar x %{SOURCE2} %{buildroot}%{_datadir}/%{name}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc *.txt docs/*
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
%dir %{_sysconfdir}/%{name}
%if %{with debug}
%{_bindir}/%{name}d
%else
%{_bindir}/%{name}
%endif
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/artwork
%dir %{_datadir}/%{name}/roms
%dir %{_datadir}/%{name}/ctrlr
%{_datadir}/%{name}/fonts
%dir %{_datadir}/%{name}/hash
%dir %{_datadir}/%{name}/samples
%dir %{_datadir}/%{name}/software
%dir %{_datadir}/%{name}/cheats
%{_sysconfdir}/skel/.%{name}
%files tools
%defattr(-,root,root,-)
%doc imgtool.txt
%{_bindir}/castool
%{_bindir}/dat2html
%{_bindir}/imgtool
%{_bindir}/messtest
%files data
%defattr(-,root,root,-)
%{_datadir}/%{name}/sysinfo.dat
%{_datadir}/%{name}/artwork/*
%{_datadir}/%{name}/ctrlr/*
%{_datadir}/%{name}/hash/*
%changelog
* Mon May 24 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138-2
- Binary is MAME-licensed, BSD only applies to the source
* Sun May 23 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138-1
- Initial package based on mame and sdlmess
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 29 May 2010 11:42:22 -0000 1.1
+++ .cvsignore 29 May 2010 15:26:42 -0000 1.2
@@ -0,0 +1,3 @@
+ctrlr.rar
+mame0138s.exe
+mess0138s.zip
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mess/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 29 May 2010 11:42:22 -0000 1.1
+++ sources 29 May 2010 15:26:42 -0000 1.2
@@ -0,0 +1,3 @@
+d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
+438b8469518218babfc570606d4b103a mame0138s.exe
+83ffe85be0671b0bbe8072a1e8f917e9 mess0138s.zip
13 years, 11 months
rpms/mess/devel mess-fortify.patch, NONE, 1.1 mess-verbosebuild.patch, NONE, 1.1 mess.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12449
Modified Files:
.cvsignore sources
Added Files:
mess-fortify.patch mess-verbosebuild.patch mess.spec
Log Message:
Initial import
mess-fortify.patch:
sdlprefix.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE mess-fortify.patch ---
diff -up mame-0.137/src/osd/sdl/sdlprefix.h.fortify mame-0.137/src/osd/sdl/sdlprefix.h
--- mame-0.137/src/osd/sdl/sdlprefix.h.fortify 2010-03-21 14:20:41.000000000 +0100
+++ mame-0.137/src/osd/sdl/sdlprefix.h 2010-03-21 14:21:07.000000000 +0100
@@ -50,9 +50,9 @@
#endif
// fix for Ubuntu 8.10
-#ifdef _FORTIFY_SOURCE
-#undef _FORTIFY_SOURCE
-#endif
+// #ifdef _FORTIFY_SOURCE
+// #undef _FORTIFY_SOURCE
+// #endif
#endif /* SDLMAME_UNIX */
mess-verbosebuild.patch:
makefile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE mess-verbosebuild.patch ---
diff -up mame-0.137/makefile.verbosebuild mame-0.137/makefile
--- mame-0.137/makefile.verbosebuild 2010-03-21 15:38:37.000000000 +0100
+++ mame-0.137/makefile 2010-03-21 15:40:09.000000000 +0100
@@ -268,11 +268,11 @@ BUILD_EXE = $(EXE)
endif
# compiler, linker and utilities
-AR = @ar
-CC = @gcc
-LD = @g++
+AR = ar
+CC = gcc
+LD = g++
MD = -mkdir$(EXE)
-RM = @rm -f
+RM = rm -f
@@ -688,12 +688,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
$(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR)
@echo Converting $<...
- @$(FILE2STR) $< $@ layout_$(basename $(notdir $<))
+ $(FILE2STR) $< $@ layout_$(basename $(notdir $<))
$(OBJ)/%.fh: $(SRC)/%.png $(PNG2BDC) $(FILE2STR)
@echo Converting $<...
- @$(PNG2BDC) $< $(OBJ)/temp.bdc
- @$(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
+ $(PNG2BDC) $< $(OBJ)/temp.bdc
+ $(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
$(OBJ)/%.a:
@echo Archiving $@...
--- NEW FILE mess.spec ---
# the debug build is disabled by default, please use --with debug to override
%bcond_with debug
%global baseversion 138
Name: mess
Version: 0.%{baseversion}
Release: 2%{?dist}
Summary: Multiple Emulator Super System
Group: Applications/Emulators
#Files in src/lib/util and src/osd (except src/osd/sdl) are BSD
License: MAME License
URL: http://www.mess.org/
Source0: http://www.aarongiles.com/mirror/releases/mame0%{baseversion}s.exe
Source1: http://www.mess.org/files/%{name}0%{baseversion}s.zip
Source2: ctrlr.rar
#ui.bdc generated from ui.bdf
#Source2: ui.bdc
Patch0: %{name}-fortify.patch
Patch1: %{name}-verbosebuild.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: expat-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
BuildRequires: p7zip
BuildRequires: SDL-devel
BuildRequires: unrar
BuildRequires: zlib-devel
Provides: sdlmess = 0%{baseversion}-%{release}
Obsoletes: sdlmess < 0136-2
%description
MESS is an acronym that stands for Multiple Emulator Super System. MESS will
more or less faithfully reproduce computer and console systems on a PC.
MESS emulates the hardware of the systems and sometimes utilizes ROM images to
load programs and games. Therefore, these systems are NOT simulations, but
the actual emulations of the hardware.
%package tools
Summary: Tools used for the MESS package
Group: Applications/Emulators
Requires: %{name} = %{version}-%{release}
Provides: sdlmess-tools = 0%{baseversion}-%{release}
Obsoletes: sdlmess-tools < 0136-2
%description tools
%{summary}.
%package data
Summary: Data files used for the MESS package
Group: Applications/Emulators
Requires: %{name} = %{version}-%{release}
Provides: sdlmess-data = 0%{baseversion}-%{release}
Obsoletes: sdlmess-data < 0136-2
BuildArch: noarch
%description data
%{summary}.
%prep
%setup -qcT
7za x %{SOURCE0}
find . -type f -not -name uismall.png -exec sed -i 's/\r//' {} \;
unzip -o %{SOURCE1}
%patch0 -p1 -b .fortify
%patch1 -p1 -b .verbosebuild
# Remove windows-specific documentation
rm -fr docs/win*
# Move the imgtool documentation to the top dir for better visibility
mv docs/imgtool.txt .
# Fix permissions
chmod 644 docs/config.txt docs/credits.htm docs/license.txt docs/mame.txt docs/newvideo.txt
find src/mess -type f \( -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
chmod 644 src/mame/machine/snescx4.h
# Fix newvideo.txt encoding
pushd docs
/usr/bin/iconv -f cp1250 -t utf-8 newvideo.txt > newvideo.txt.conv
/bin/mv -f newvideo.txt.conv newvideo.txt
popd
# Create ini file
cat > %{name}.ini << EOF
# Define multi-user paths
artpath %{_datadir}/%{name}/artwork;%{_datadir}/%{name}/effects
ctrlrpath %{_datadir}/%{name}/ctrlr
fontpath %{_datadir}/%{name}/fonts
hashpath %{_datadir}/%{name}/hash
rompath %{_datadir}/%{name}/roms
samplepath %{_datadir}/%{name}/samples
cheatpath %{_datadir}/%{name}/cheats
# Allow user to override ini settings
inipath \$HOME/.%{name}/ini;%{_sysconfdir}/%{name}
# Set paths for local storage
cfg_directory \$HOME/.%{name}/cfg
comment_directory \$HOME/.%{name}/comments
diff_directory \$HOME/.%{name}/diff
input_directory \$HOME/.%{name}/inp
memcard_directory \$HOME/.%{name}/memcard
nvram_directory \$HOME/.%{name}/nvram
snapshot_directory \$HOME/.%{name}/snap
state_directory \$HOME/.%{name}/sta
# Fedora custom defaults
video opengl
autosave 1
joystick 1
EOF
%build
%if %{with debug}
make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' DEBUG=1 all TARGET=mess
%else
make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \
OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' all TARGET=mess
%endif
%install
rm -rf %{buildroot}
# create directories
install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_datadir}/%{name}/artwork
install -d %{buildroot}%{_datadir}/%{name}/roms
install -d %{buildroot}%{_datadir}/%{name}/ctrlr
install -d %{buildroot}%{_datadir}/%{name}/fonts
install -d %{buildroot}%{_datadir}/%{name}/hash
install -d %{buildroot}%{_datadir}/%{name}/samples
install -d %{buildroot}%{_datadir}/%{name}/software
install -d %{buildroot}%{_datadir}/%{name}/cheats
install -d %{buildroot}%{_sysconfdir}/%{name}
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/diff
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/ini
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/inp
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/memcard
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/nvram
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/sta
install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/snap
# Install binaries and config files
%if %{with debug}
install -pm 755 %{name}d %{buildroot}%{_bindir}
%else
install -pm 755 %{name} %{buildroot}%{_bindir}
%endif
install -pm 755 castool dat2html imgtool messtest %{buildroot}%{_bindir}
install -pm 644 sysinfo.dat %{buildroot}%{_datadir}/%{name}
install -pm 644 artwork/* %{buildroot}%{_datadir}/%{name}/artwork
#install -pm 644 ui.bdf %{SOURCE2} %{buildroot}%{_datadir}/%{name}/fonts
install -pm 644 hash/* %{buildroot}%{_datadir}/%{name}/hash
install -pm 644 %{name}.ini %{buildroot}%{_sysconfdir}/%{name}
# Install controller files
unrar x %{SOURCE2} %{buildroot}%{_datadir}/%{name}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc *.txt docs/*
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
%dir %{_sysconfdir}/%{name}
%if %{with debug}
%{_bindir}/%{name}d
%else
%{_bindir}/%{name}
%endif
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/artwork
%dir %{_datadir}/%{name}/roms
%dir %{_datadir}/%{name}/ctrlr
%{_datadir}/%{name}/fonts
%dir %{_datadir}/%{name}/hash
%dir %{_datadir}/%{name}/samples
%dir %{_datadir}/%{name}/software
%dir %{_datadir}/%{name}/cheats
%{_sysconfdir}/skel/.%{name}
%files tools
%defattr(-,root,root,-)
%doc imgtool.txt
%{_bindir}/castool
%{_bindir}/dat2html
%{_bindir}/imgtool
%{_bindir}/messtest
%files data
%defattr(-,root,root,-)
%{_datadir}/%{name}/sysinfo.dat
%{_datadir}/%{name}/artwork/*
%{_datadir}/%{name}/ctrlr/*
%{_datadir}/%{name}/hash/*
%changelog
* Mon May 24 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138-2
- Binary is MAME-licensed, BSD only applies to the source
* Sun May 23 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.138-1
- Initial package based on mame and sdlmess
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mess/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 29 May 2010 11:42:22 -0000 1.1
+++ .cvsignore 29 May 2010 15:26:31 -0000 1.2
@@ -0,0 +1,3 @@
+ctrlr.rar
+mame0138s.exe
+mess0138s.zip
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mess/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 29 May 2010 11:42:22 -0000 1.1
+++ sources 29 May 2010 15:26:31 -0000 1.2
@@ -0,0 +1,3 @@
+d907085f2f69b74198796378e3ed0cb3 ctrlr.rar
+438b8469518218babfc570606d4b103a mame0138s.exe
+83ffe85be0671b0bbe8072a1e8f917e9 mess0138s.zip
13 years, 11 months
rpms/gpac/F-13 gpac-0.4.6-osmo.patch, NONE, 1.1 gpac-0.4.6-soname.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gpac-0.4.5-amr.patch, 1.1, 1.2 gpac-0.4.6-ffmpeg.patch, 1.2, 1.3 gpac-0.4.6-makefix.patch, 1.1, 1.2 gpac.spec, 1.17, 1.18 sources, 1.5, 1.6 gpac-0.4.5-lib64.patch, 1.1, NONE gpac-0.4.5-shared_sggen.patch, 1.3, NONE gpac-0.4.5-soname.patch, 1.1, NONE gpac-0.4.5-system_openjpeg.patch, 1.1, NONE gpac-0.4.6-ogl_libs.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1374/F-13
Modified Files:
.cvsignore gpac-0.4.5-amr.patch gpac-0.4.6-ffmpeg.patch
gpac-0.4.6-makefix.patch gpac.spec sources
Added Files:
gpac-0.4.6-osmo.patch gpac-0.4.6-soname.patch
Removed Files:
gpac-0.4.5-lib64.patch gpac-0.4.5-shared_sggen.patch
gpac-0.4.5-soname.patch gpac-0.4.5-system_openjpeg.patch
gpac-0.4.6-ogl_libs.patch
Log Message:
- Rewrite soname patch that is still needed.
- Allow --with osmo conditional
- Explicitely list binaries.
gpac-0.4.6-osmo.patch:
configure | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE gpac-0.4.6-osmo.patch ---
--- gpac/configure.osmo 2010-05-27 13:25:30.365191378 -0600
+++ gpac/configure 2010-05-27 14:03:08.494369924 -0600
@@ -1007,6 +1016,11 @@ wx_cflags=`wx-config --cppflags core, ba
wx_lflags=`wx-config --libs core, base`
fi
+if test "$has_wx" = "yes"; then
+wx_lflags="${wx_lflags} `gtk-config --libs`"
+wx_lflags="${wx_lflags} `pkg-config --libs gdk-2.0` -lstdc++"
+fi
+
if test "$darwin" = "yes" ; then
wx_lflags="-Wl,-bind_at_load $wx_lflags -lstdc++" #10.4 needs it, not sure about 10.3
fi
gpac-0.4.6-soname.patch:
Makefile | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--- NEW FILE gpac-0.4.6-soname.patch ---
diff -up gpac/src/Makefile.soname gpac/src/Makefile
--- gpac/src/Makefile.soname 2010-05-29 15:48:35.000000000 +0200
+++ gpac/src/Makefile 2010-05-29 15:57:23.000000000 +0200
@@ -158,27 +158,27 @@ endif
##libgpac library output
-LIB=libgpac.$(DYN_LIB_SUFFIX)
+LIBGPAC=libgpac.$(DYN_LIB_SUFFIX)
+LIBGPAC_SOVERSION=".0"
+LIBGPAC_SONAME=$(LIBGPAC)$(LIBGPAC_SOVERSION)
+LD_SONAME="-Wl,-soname,$(LIBGPAC_SONAME)"
ifeq ($(CONFIG_WIN32),yes)
#LDFLAGS+=-export-symbols libgpac.def
+LD_SONAME=
else
ifeq ($(CONFIG_DARWIN),yes)
-LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
+LDFLAGS+=-install_name $(prefix)/lib/$(LIBGPAC)
+LD_SONAME=
endif
EXTRALIBS+=$(GPAC_SH_FLAGS)
endif
-LD_SONAME="-Wl,-soname,$(LIB)"
-ifeq ($(CONFIG_DARWIN), yes)
-LD_SONAME=
-endif
-
SRCS := $(OBJS:.o=.c)
all: lib
-lib: $(LIB)
+lib: $(LIBGPAC)
#there's a bunch of warnings in there, get rid of them
mcrypt: CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include
@@ -197,7 +197,7 @@ compositor: $(LIBGPAC_COMPOSITOR)
$(CC) $(CFLAGS) -c -o $@ $<
-$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
+$(LIBGPAC): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
ifeq ($(CONFIG_DARWIN),yes)
libtool -s -o ../bin/gcc/libgpac_static.a $(OBJS)
ranlib ../bin/gcc/libgpac_static.a
@@ -215,7 +215,7 @@ depend:
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
clean:
- rm -f $(OBJS) ../bin/gcc/$(LIB)
+ rm -f $(OBJS) ../bin/gcc/$(LIBGPAC)
rm -rf ../bin/gcc/libgpac_static.a
distclean: clean
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 17 Jan 2010 00:43:58 -0000 1.5
+++ .cvsignore 29 May 2010 14:27:54 -0000 1.6
@@ -1 +1 @@
-gpac-20100116.tar.bz2
+gpac-20100527.tar.bz2
gpac-0.4.5-amr.patch:
amr_dec/Makefile | 31 +++++--------------------------
amr_float_dec/Makefile | 12 +++++++-----
2 files changed, 12 insertions(+), 31 deletions(-)
Index: gpac-0.4.5-amr.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/F-13/gpac-0.4.5-amr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-0.4.5-amr.patch 17 Dec 2008 14:18:44 -0000 1.1
+++ gpac-0.4.5-amr.patch 29 May 2010 14:27:54 -0000 1.2
@@ -1,20 +1,6 @@
-diff -up gpac/modules/amr_dec/amr_dec.c.amr gpac/modules/amr_dec/amr_dec.c
---- gpac/modules/amr_dec/amr_dec.c.amr 2008-12-17 12:33:30.000000000 +0100
-+++ gpac/modules/amr_dec/amr_dec.c 2008-12-17 12:33:52.000000000 +0100
-@@ -24,8 +24,8 @@
-
-
- /*include AMR stuff*/
--#include "amr_nb/sp_dec.h"
--#include "amr_nb/d_homing.h"
-+#include <amrnb/sp_dec.h>
-+#include <amrnb/d_homing.h>
- /*remove AMR types to avoid any typedef warning/error*/
- #undef Float
- #undef Bool
diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile
---- gpac/modules/amr_dec/Makefile.amr 2008-12-17 12:33:42.000000000 +0100
-+++ gpac/modules/amr_dec/Makefile 2008-12-17 12:33:49.000000000 +0100
+--- gpac/modules/amr_dec/Makefile.amr 2010-05-04 05:27:18.000000000 -0600
++++ gpac/modules/amr_dec/Makefile 2010-05-27 13:02:48.630191469 -0600
@@ -17,31 +17,7 @@ LDFLAGS+=-pg
endif
@@ -48,8 +34,8 @@
SRCS := $(OBJS:.o=.c)
-@@ -56,11 +32,14 @@ else
- OBJSPIC=$(OBJS)
+@@ -50,11 +26,14 @@ ifeq ($(CONFIG_WIN32),yes)
+ #LDFLAGS+=-export-symbols amr_dec.def
endif
+AMR_NB_LIBS=-lamrnb
@@ -59,32 +45,14 @@
$(LIB): $(OBJS)
-- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
+- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
%.o: %.c
-diff -up gpac/modules/amr_float_dec/amr_float_dec.c.amr gpac/modules/amr_float_dec/amr_float_dec.c
---- gpac/modules/amr_float_dec/amr_float_dec.c.amr 2008-12-17 12:37:26.000000000 +0100
-+++ gpac/modules/amr_float_dec/amr_float_dec.c 2008-12-17 12:38:07.000000000 +0100
-@@ -31,12 +31,12 @@
-
- #ifdef GPAC_HAS_AMR_FT
- /*AMR NB*/
--#include "amr_nb_ft/interf_dec.h"
-+#include <amrnb/interf_dec.h>
- #endif
-
- #ifdef GPAC_HAS_AMR_FT_WB
- /*AMR WB*/
--#include "amr_wb_ft/dec_if.h"
-+#include <amrwb/dec_if.h>
- #endif
-
- /*default size in CU of composition memory for audio*/
diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile
---- gpac/modules/amr_float_dec/Makefile.amr 2008-12-17 12:34:17.000000000 +0100
-+++ gpac/modules/amr_float_dec/Makefile 2008-12-17 12:36:56.000000000 +0100
+--- gpac/modules/amr_float_dec/Makefile.amr 2010-05-04 05:27:21.000000000 -0600
++++ gpac/modules/amr_float_dec/Makefile 2010-05-27 13:05:42.286191285 -0600
@@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o
#AMR NB obj
CFLAGS+=-DGPAC_HAS_AMR_FT
@@ -108,12 +76,12 @@
endif
-@@ -51,7 +53,7 @@ all: $(LIB)
+@@ -45,7 +47,7 @@ all: $(LIB)
- $(LIB): $(OBJSPIC)
-- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
+ $(LIB): $(OBJS)
+- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
%.o: %.c
gpac-0.4.6-ffmpeg.patch:
configure | 19 ++++++++++++++++---
modules/ffmpeg_in/Makefile | 6 ++----
2 files changed, 18 insertions(+), 7 deletions(-)
Index: gpac-0.4.6-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/F-13/gpac-0.4.6-ffmpeg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpac-0.4.6-ffmpeg.patch 17 Jan 2010 00:43:58 -0000 1.2
+++ gpac-0.4.6-ffmpeg.patch 29 May 2010 14:27:54 -0000 1.3
@@ -49,8 +49,8 @@
echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak
echo "CONFIG_ALSA=$has_alsa" >> config.mak
diff -up gpac/modules/ffmpeg_in/Makefile.ffmpeg gpac/modules/ffmpeg_in/Makefile
---- gpac/modules/ffmpeg_in/Makefile.ffmpeg 2009-07-31 09:37:41.000000000 +0200
-+++ gpac/modules/ffmpeg_in/Makefile 2010-01-16 19:09:26.460862249 +0100
+--- gpac/modules/ffmpeg_in/Makefile.ffmpeg 2010-05-21 01:49:31.000000000 -0600
++++ gpac/modules/ffmpeg_in/Makefile 2010-05-27 13:17:56.052191678 -0600
@@ -2,7 +2,7 @@ include ../../config.mak
vpath %.c $(SRC_PATH)/modules/ffmpeg_in
@@ -60,13 +60,16 @@
ifeq ($(DEBUGBUILD), yes)
CFLAGS+=-g
-@@ -15,13 +15,11 @@ LDFLAGS+=-pg
+@@ -15,7 +15,7 @@ LDFLAGS+=-pg
endif
LOCAL_LIB=
--LINKLIBS=-lgpac -lavcodec -lavformat -lz
+-LINKLIBS=-lgpac -lavcodec -lavformat -lavutil -lz
+LINKLIBS=-lgpac -lz $(FFMPEG_LFLAGS)
+ #darwin needs bz2
+ ifeq ($(CONFIG_DARWIN),yes)
+@@ -25,8 +25,6 @@ endif
#old ffmpeg lib
ifeq ($(CONFIG_FFMPEG_OLD), yes)
CFLAGS+=-DFFMPEG_OLD_HEADERS
gpac-0.4.6-makefix.patch:
Makefile | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
Index: gpac-0.4.6-makefix.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/F-13/gpac-0.4.6-makefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-0.4.6-makefix.patch 19 Sep 2009 12:08:42 -0000 1.1
+++ gpac-0.4.6-makefix.patch 29 May 2010 14:27:54 -0000 1.2
@@ -1,7 +1,6 @@
-diff -up gpac/Makefile.makefix gpac/Makefile
---- gpac/Makefile.makefix 2009-07-31 18:43:25.000000000 +0200
-+++ gpac/Makefile 2009-09-01 17:14:20.615499921 +0200
-@@ -60,11 +60,11 @@ install:
+--- gpac/Makefile.makefix 2010-05-05 09:18:35.000000000 -0600
++++ gpac/Makefile 2010-05-27 12:19:54.051316154 -0600
+@@ -60,11 +60,11 @@
install -d "$(DESTDIR)$(mandir)"
install -d "$(DESTDIR)$(mandir)/man1"
if [ -d doc ] ; then \
@@ -12,12 +11,12 @@
+ install -pm 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ ; \
+ install -pm 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ ; \
install -d "$(DESTDIR)$(prefix)/share/gpac" ; \
-- install -m 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
-+ install -pm 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
+- install -m 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
++ install -pm 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
fi
- uninstall:
-@@ -89,23 +89,25 @@ ifeq ($(CONFIG_DARWIN),yes)
+ # install -d "$(DESTDIR)$(prefix)/share/gpac/gui" ; \
+@@ -97,23 +97,25 @@
install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
else
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/F-13/gpac.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gpac.spec 13 Mar 2010 12:55:05 -0000 1.17
+++ gpac.spec 29 May 2010 14:27:54 -0000 1.18
@@ -7,8 +7,7 @@
# - Fix unused-direct-shlib-dependency on libgpac
%global osmo Osmo4
-%global cvs 20100116
-%global with_osmo 0
+%global cvs 20100527
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
%global geckover 1.9.1
@@ -18,7 +17,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
-Release: 0.5.cvs%{?cvs}%{?dist}
+Release: 0.7.cvs%{?cvs}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@@ -27,14 +26,12 @@
Source9: gpac-snapshot.sh
#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853860&group_id=84101
Patch0: gpac-0.4.6-makefix.patch
-Patch1: gpac-0.4.5-soname.patch
+Patch1: gpac-0.4.6-soname.patch
Patch2: gpac-0.4.5-amr.patch
-Patch3: gpac-0.4.5-lib64.patch
-Patch4: gpac-0.4.5-system_openjpeg.patch
Patch5: gpac-0.4.6-js_cflags.patch
#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101
Patch9: gpac-0.4.6-ffmpeg.patch
-Patch10: gpac-0.4.6-ogl_libs.patch
+Patch11: gpac-0.4.6-osmo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
@@ -66,6 +63,7 @@
BuildRequires: doxygen
BuildRequires: desktop-file-utils
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
+%{?_with_osmo:BuildRequires: gtk+-devel gtk2-devel}
%description
GPAC is a multimedia framework based on the MPEG-4 Systems standard developed
@@ -112,7 +110,7 @@
%description devel-static
Static library for gpac.
-%if %{with_osmo}
+%{?_with_osmo:
%package -n %{osmo}
Summary: Media player based on gpac
Group: Applications/Multimedia
@@ -130,7 +128,7 @@
* Support for Advanced Text and Graphics extension of MPEG-4 Systems
under standardization.
* Frame export to JPG, PNG, BMP.
-%endif
+}
%{?_with_mozilla:
%package -n mozilla-%{osmo}
@@ -151,13 +149,9 @@
%patch0 -p1 -b .makefix
%patch1 -p1 -b .soname
%patch2 -p1 -b .amr
-%if %{_lib} == "lib64"
-%patch3 -p1 -b .lib64
-%endif
-%patch4 -p1 -b .openjpeg
%patch5 -p1 -b .jscflags
%patch9 -p1 -b .ffmpeg
-%patch10 -p1 -b .ogl_libs
+%patch11 -p1 -b .osmo
## kwizart - enable dynamic mode - hardcoded with patch2
# define SONAME number from the first number of gpac version.
@@ -180,7 +174,7 @@
%configure \
--enable-debug \
--X11-path=%{_prefix} \
- --extra-cflags="$RPM_OPT_FLAGS -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
+ --extra-cflags="$RPM_OPT_FLAGS -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
--disable-oss-audio \
%{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
%{?_with_amr:--enable-amr} \
@@ -215,9 +209,9 @@
}
# Parallele build will fail
-make all
+make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
#{?_smp_mflags}
-make sggen
+make sggen OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
#{?_smp_mflags}
## kwizart - build doxygen doc for devel
@@ -236,7 +230,7 @@
install -m 755 bin/gcc/nposmozilla.xpt $RPM_BUILD_ROOT%{_libdir}/mozilla/components/nposmozilla.xpt
}
-%if %{with_osmo}
+%{?_with_osmo:
# Desktop menu Osmo4
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
cat > %{osmo}.desktop <<EOF
@@ -260,9 +254,10 @@
#icons
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -pm 0644 applications/osmo4_wx/osmo4.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{osmo}.xpm
-%else
+}
+%{?!_with_osmo:
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
-%endif
+}
## kwizart - rpmlint gpac no-ldconfig-symlink
ln -sf libgpac.so.%{version}-DEV $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
@@ -277,7 +272,6 @@
#Fix doxygen timestamp
touch -r Changelog doc/html/*
-touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
%clean
@@ -291,8 +285,11 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS Changelog COPYING README TODO
-%{_bindir}/MP4*
-%{_bindir}/*Gen
+%{_bindir}/MP4Box
+%{_bindir}/MP4Client
+%{_bindir}/MPEG4Gen
+%{_bindir}/SVGGen
+%{_bindir}/X3DGen
%{_datadir}/gpac/
%{_mandir}/man1/*.1.*
@@ -301,14 +298,14 @@
%{_libdir}/libgpac.so.*
%{_libdir}/gpac/
-%if %{with_osmo}
+%{?_with_osmo:
%files -n %{osmo}
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING README TODO
%{_bindir}/Osmo4
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{osmo}.xpm
-%endif
+}
%{?_with_mozilla:
%files -n mozilla-%{osmo}
@@ -333,6 +330,17 @@
%changelog
+* Sat May 29 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0.4.6-0.7cvs20100116
+- Rewrite soname patch that is still needed.
+- Allow --with osmo conditional
+- Explicitely list binaries.
+
+* Thu May 27 2010 Lucas Jacobs <lucas.jacobs(a)mines.sdsmt.edu> - 0.4.6-0.6cvs20100527
+- Update to 20100527
+- Removed upstreamed lib64, soname, OpenJPEG, OpenGL patches
+- Update ffmpeg, makefix and amr patches
+- Added patch to build osmo4_wx properly
+
* Sat Mar 13 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0.4.6-0.5.cvs20100116
- Fix CFLAGS for large files rfbz#1116
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/F-13/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 17 Jan 2010 00:43:58 -0000 1.5
+++ sources 29 May 2010 14:27:54 -0000 1.6
@@ -1 +1 @@
-6090746dc1e63b30186029acd390d6cb gpac-20100116.tar.bz2
+4f715901107857505334dbf9e5975f4c gpac-20100527.tar.bz2
--- gpac-0.4.5-lib64.patch DELETED ---
--- gpac-0.4.5-shared_sggen.patch DELETED ---
--- gpac-0.4.5-soname.patch DELETED ---
--- gpac-0.4.5-system_openjpeg.patch DELETED ---
--- gpac-0.4.6-ogl_libs.patch DELETED ---
13 years, 11 months
rpms/cairo-dock/F-12 cairo-dock.spec,1.49,1.50
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32450
Modified Files:
cairo-dock.spec
Log Message:
Also rebuild for F-12
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/cairo-dock.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- cairo-dock.spec 21 Apr 2010 15:46:40 -0000 1.49
+++ cairo-dock.spec 29 May 2010 14:11:54 -0000 1.50
@@ -24,7 +24,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 1
+%global fedora_main_rel 2
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -88,7 +88,8 @@
BuildRequires: libXxf86vm-devel
BuildRequires: vte-devel
# Not shown in .pc files
-BuildRequires: libetpan-devel
+# Check if buildroot is actually using new libetpan
+BuildRequires: libetpan-devel >= 1.0
# For plug-ins-xfce
%if %{build_xfce} > 0
BuildRequires: Thunar-devel
@@ -622,6 +623,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed May 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- rebuild against new libetpan
+
* Thu Apr 22 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.9-1
- 2.1.3-9
13 years, 11 months
rpms/gpac/devel gpac-0.4.6-osmo.patch, NONE, 1.1 gpac-0.4.6-soname.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gpac-0.4.5-amr.patch, 1.1, 1.2 gpac-0.4.6-ffmpeg.patch, 1.2, 1.3 gpac-0.4.6-makefix.patch, 1.1, 1.2 gpac.spec, 1.17, 1.18 sources, 1.5, 1.6 gpac-0.4.5-lib64.patch, 1.1, NONE gpac-0.4.5-shared_sggen.patch, 1.3, NONE gpac-0.4.5-soname.patch, 1.1, NONE gpac-0.4.5-system_openjpeg.patch, 1.1, NONE gpac-0.4.6-ogl_libs.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32268/devel
Modified Files:
.cvsignore gpac-0.4.5-amr.patch gpac-0.4.6-ffmpeg.patch
gpac-0.4.6-makefix.patch gpac.spec sources
Added Files:
gpac-0.4.6-osmo.patch gpac-0.4.6-soname.patch
Removed Files:
gpac-0.4.5-lib64.patch gpac-0.4.5-shared_sggen.patch
gpac-0.4.5-soname.patch gpac-0.4.5-system_openjpeg.patch
gpac-0.4.6-ogl_libs.patch
Log Message:
- Rewrite soname patch that is still needed.
- Allow --with osmo conditional
- Explicitely list binaries.
gpac-0.4.6-osmo.patch:
configure | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE gpac-0.4.6-osmo.patch ---
--- gpac/configure.osmo 2010-05-27 13:25:30.365191378 -0600
+++ gpac/configure 2010-05-27 14:03:08.494369924 -0600
@@ -1007,6 +1016,11 @@ wx_cflags=`wx-config --cppflags core, ba
wx_lflags=`wx-config --libs core, base`
fi
+if test "$has_wx" = "yes"; then
+wx_lflags="${wx_lflags} `gtk-config --libs`"
+wx_lflags="${wx_lflags} `pkg-config --libs gdk-2.0` -lstdc++"
+fi
+
if test "$darwin" = "yes" ; then
wx_lflags="-Wl,-bind_at_load $wx_lflags -lstdc++" #10.4 needs it, not sure about 10.3
fi
gpac-0.4.6-soname.patch:
Makefile | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--- NEW FILE gpac-0.4.6-soname.patch ---
diff -up gpac/src/Makefile.soname gpac/src/Makefile
--- gpac/src/Makefile.soname 2010-05-29 15:48:35.000000000 +0200
+++ gpac/src/Makefile 2010-05-29 15:57:23.000000000 +0200
@@ -158,27 +158,27 @@ endif
##libgpac library output
-LIB=libgpac.$(DYN_LIB_SUFFIX)
+LIBGPAC=libgpac.$(DYN_LIB_SUFFIX)
+LIBGPAC_SOVERSION=".0"
+LIBGPAC_SONAME=$(LIBGPAC)$(LIBGPAC_SOVERSION)
+LD_SONAME="-Wl,-soname,$(LIBGPAC_SONAME)"
ifeq ($(CONFIG_WIN32),yes)
#LDFLAGS+=-export-symbols libgpac.def
+LD_SONAME=
else
ifeq ($(CONFIG_DARWIN),yes)
-LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
+LDFLAGS+=-install_name $(prefix)/lib/$(LIBGPAC)
+LD_SONAME=
endif
EXTRALIBS+=$(GPAC_SH_FLAGS)
endif
-LD_SONAME="-Wl,-soname,$(LIB)"
-ifeq ($(CONFIG_DARWIN), yes)
-LD_SONAME=
-endif
-
SRCS := $(OBJS:.o=.c)
all: lib
-lib: $(LIB)
+lib: $(LIBGPAC)
#there's a bunch of warnings in there, get rid of them
mcrypt: CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include
@@ -197,7 +197,7 @@ compositor: $(LIBGPAC_COMPOSITOR)
$(CC) $(CFLAGS) -c -o $@ $<
-$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
+$(LIBGPAC): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
ifeq ($(CONFIG_DARWIN),yes)
libtool -s -o ../bin/gcc/libgpac_static.a $(OBJS)
ranlib ../bin/gcc/libgpac_static.a
@@ -215,7 +215,7 @@ depend:
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
clean:
- rm -f $(OBJS) ../bin/gcc/$(LIB)
+ rm -f $(OBJS) ../bin/gcc/$(LIBGPAC)
rm -rf ../bin/gcc/libgpac_static.a
distclean: clean
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 17 Jan 2010 00:43:58 -0000 1.5
+++ .cvsignore 29 May 2010 14:10:47 -0000 1.6
@@ -1 +1 @@
-gpac-20100116.tar.bz2
+gpac-20100527.tar.bz2
gpac-0.4.5-amr.patch:
amr_dec/Makefile | 31 +++++--------------------------
amr_float_dec/Makefile | 12 +++++++-----
2 files changed, 12 insertions(+), 31 deletions(-)
Index: gpac-0.4.5-amr.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac-0.4.5-amr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-0.4.5-amr.patch 17 Dec 2008 14:18:44 -0000 1.1
+++ gpac-0.4.5-amr.patch 29 May 2010 14:10:47 -0000 1.2
@@ -1,20 +1,6 @@
-diff -up gpac/modules/amr_dec/amr_dec.c.amr gpac/modules/amr_dec/amr_dec.c
---- gpac/modules/amr_dec/amr_dec.c.amr 2008-12-17 12:33:30.000000000 +0100
-+++ gpac/modules/amr_dec/amr_dec.c 2008-12-17 12:33:52.000000000 +0100
-@@ -24,8 +24,8 @@
-
-
- /*include AMR stuff*/
--#include "amr_nb/sp_dec.h"
--#include "amr_nb/d_homing.h"
-+#include <amrnb/sp_dec.h>
-+#include <amrnb/d_homing.h>
- /*remove AMR types to avoid any typedef warning/error*/
- #undef Float
- #undef Bool
diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile
---- gpac/modules/amr_dec/Makefile.amr 2008-12-17 12:33:42.000000000 +0100
-+++ gpac/modules/amr_dec/Makefile 2008-12-17 12:33:49.000000000 +0100
+--- gpac/modules/amr_dec/Makefile.amr 2010-05-04 05:27:18.000000000 -0600
++++ gpac/modules/amr_dec/Makefile 2010-05-27 13:02:48.630191469 -0600
@@ -17,31 +17,7 @@ LDFLAGS+=-pg
endif
@@ -48,8 +34,8 @@
SRCS := $(OBJS:.o=.c)
-@@ -56,11 +32,14 @@ else
- OBJSPIC=$(OBJS)
+@@ -50,11 +26,14 @@ ifeq ($(CONFIG_WIN32),yes)
+ #LDFLAGS+=-export-symbols amr_dec.def
endif
+AMR_NB_LIBS=-lamrnb
@@ -59,32 +45,14 @@
$(LIB): $(OBJS)
-- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
+- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
%.o: %.c
-diff -up gpac/modules/amr_float_dec/amr_float_dec.c.amr gpac/modules/amr_float_dec/amr_float_dec.c
---- gpac/modules/amr_float_dec/amr_float_dec.c.amr 2008-12-17 12:37:26.000000000 +0100
-+++ gpac/modules/amr_float_dec/amr_float_dec.c 2008-12-17 12:38:07.000000000 +0100
-@@ -31,12 +31,12 @@
-
- #ifdef GPAC_HAS_AMR_FT
- /*AMR NB*/
--#include "amr_nb_ft/interf_dec.h"
-+#include <amrnb/interf_dec.h>
- #endif
-
- #ifdef GPAC_HAS_AMR_FT_WB
- /*AMR WB*/
--#include "amr_wb_ft/dec_if.h"
-+#include <amrwb/dec_if.h>
- #endif
-
- /*default size in CU of composition memory for audio*/
diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile
---- gpac/modules/amr_float_dec/Makefile.amr 2008-12-17 12:34:17.000000000 +0100
-+++ gpac/modules/amr_float_dec/Makefile 2008-12-17 12:36:56.000000000 +0100
+--- gpac/modules/amr_float_dec/Makefile.amr 2010-05-04 05:27:21.000000000 -0600
++++ gpac/modules/amr_float_dec/Makefile 2010-05-27 13:05:42.286191285 -0600
@@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o
#AMR NB obj
CFLAGS+=-DGPAC_HAS_AMR_FT
@@ -108,12 +76,12 @@
endif
-@@ -51,7 +53,7 @@ all: $(LIB)
+@@ -45,7 +47,7 @@ all: $(LIB)
- $(LIB): $(OBJSPIC)
-- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
-+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
+ $(LIB): $(OBJS)
+- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
++ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
%.o: %.c
gpac-0.4.6-ffmpeg.patch:
configure | 19 ++++++++++++++++---
modules/ffmpeg_in/Makefile | 6 ++----
2 files changed, 18 insertions(+), 7 deletions(-)
Index: gpac-0.4.6-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac-0.4.6-ffmpeg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpac-0.4.6-ffmpeg.patch 17 Jan 2010 00:43:58 -0000 1.2
+++ gpac-0.4.6-ffmpeg.patch 29 May 2010 14:10:47 -0000 1.3
@@ -49,8 +49,8 @@
echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak
echo "CONFIG_ALSA=$has_alsa" >> config.mak
diff -up gpac/modules/ffmpeg_in/Makefile.ffmpeg gpac/modules/ffmpeg_in/Makefile
---- gpac/modules/ffmpeg_in/Makefile.ffmpeg 2009-07-31 09:37:41.000000000 +0200
-+++ gpac/modules/ffmpeg_in/Makefile 2010-01-16 19:09:26.460862249 +0100
+--- gpac/modules/ffmpeg_in/Makefile.ffmpeg 2010-05-21 01:49:31.000000000 -0600
++++ gpac/modules/ffmpeg_in/Makefile 2010-05-27 13:17:56.052191678 -0600
@@ -2,7 +2,7 @@ include ../../config.mak
vpath %.c $(SRC_PATH)/modules/ffmpeg_in
@@ -60,13 +60,16 @@
ifeq ($(DEBUGBUILD), yes)
CFLAGS+=-g
-@@ -15,13 +15,11 @@ LDFLAGS+=-pg
+@@ -15,7 +15,7 @@ LDFLAGS+=-pg
endif
LOCAL_LIB=
--LINKLIBS=-lgpac -lavcodec -lavformat -lz
+-LINKLIBS=-lgpac -lavcodec -lavformat -lavutil -lz
+LINKLIBS=-lgpac -lz $(FFMPEG_LFLAGS)
+ #darwin needs bz2
+ ifeq ($(CONFIG_DARWIN),yes)
+@@ -25,8 +25,6 @@ endif
#old ffmpeg lib
ifeq ($(CONFIG_FFMPEG_OLD), yes)
CFLAGS+=-DFFMPEG_OLD_HEADERS
gpac-0.4.6-makefix.patch:
Makefile | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
Index: gpac-0.4.6-makefix.patch
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac-0.4.6-makefix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-0.4.6-makefix.patch 19 Sep 2009 12:08:42 -0000 1.1
+++ gpac-0.4.6-makefix.patch 29 May 2010 14:10:47 -0000 1.2
@@ -1,7 +1,6 @@
-diff -up gpac/Makefile.makefix gpac/Makefile
---- gpac/Makefile.makefix 2009-07-31 18:43:25.000000000 +0200
-+++ gpac/Makefile 2009-09-01 17:14:20.615499921 +0200
-@@ -60,11 +60,11 @@ install:
+--- gpac/Makefile.makefix 2010-05-05 09:18:35.000000000 -0600
++++ gpac/Makefile 2010-05-27 12:19:54.051316154 -0600
+@@ -60,11 +60,11 @@
install -d "$(DESTDIR)$(mandir)"
install -d "$(DESTDIR)$(mandir)/man1"
if [ -d doc ] ; then \
@@ -12,12 +11,12 @@
+ install -pm 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ ; \
+ install -pm 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ ; \
install -d "$(DESTDIR)$(prefix)/share/gpac" ; \
-- install -m 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
-+ install -pm 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
+- install -m 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
++ install -pm 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ ; \
fi
- uninstall:
-@@ -89,23 +89,25 @@ ifeq ($(CONFIG_DARWIN),yes)
+ # install -d "$(DESTDIR)$(prefix)/share/gpac/gui" ; \
+@@ -97,23 +97,25 @@
install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
else
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gpac.spec 13 Mar 2010 12:55:05 -0000 1.17
+++ gpac.spec 29 May 2010 14:10:47 -0000 1.18
@@ -7,8 +7,7 @@
# - Fix unused-direct-shlib-dependency on libgpac
%global osmo Osmo4
-%global cvs 20100116
-%global with_osmo 0
+%global cvs 20100527
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
%global geckover 1.9.1
@@ -18,7 +17,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
-Release: 0.5.cvs%{?cvs}%{?dist}
+Release: 0.7.cvs%{?cvs}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@@ -27,14 +26,12 @@
Source9: gpac-snapshot.sh
#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853860&group_id=84101
Patch0: gpac-0.4.6-makefix.patch
-Patch1: gpac-0.4.5-soname.patch
+Patch1: gpac-0.4.6-soname.patch
Patch2: gpac-0.4.5-amr.patch
-Patch3: gpac-0.4.5-lib64.patch
-Patch4: gpac-0.4.5-system_openjpeg.patch
Patch5: gpac-0.4.6-js_cflags.patch
#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101
Patch9: gpac-0.4.6-ffmpeg.patch
-Patch10: gpac-0.4.6-ogl_libs.patch
+Patch11: gpac-0.4.6-osmo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
@@ -66,6 +63,7 @@
BuildRequires: doxygen
BuildRequires: desktop-file-utils
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
+%{?_with_osmo:BuildRequires: gtk+-devel gtk2-devel}
%description
GPAC is a multimedia framework based on the MPEG-4 Systems standard developed
@@ -112,7 +110,7 @@
%description devel-static
Static library for gpac.
-%if %{with_osmo}
+%{?_with_osmo:
%package -n %{osmo}
Summary: Media player based on gpac
Group: Applications/Multimedia
@@ -130,7 +128,7 @@
* Support for Advanced Text and Graphics extension of MPEG-4 Systems
under standardization.
* Frame export to JPG, PNG, BMP.
-%endif
+}
%{?_with_mozilla:
%package -n mozilla-%{osmo}
@@ -151,13 +149,9 @@
%patch0 -p1 -b .makefix
%patch1 -p1 -b .soname
%patch2 -p1 -b .amr
-%if %{_lib} == "lib64"
-%patch3 -p1 -b .lib64
-%endif
-%patch4 -p1 -b .openjpeg
%patch5 -p1 -b .jscflags
%patch9 -p1 -b .ffmpeg
-%patch10 -p1 -b .ogl_libs
+%patch11 -p1 -b .osmo
## kwizart - enable dynamic mode - hardcoded with patch2
# define SONAME number from the first number of gpac version.
@@ -180,7 +174,7 @@
%configure \
--enable-debug \
--X11-path=%{_prefix} \
- --extra-cflags="$RPM_OPT_FLAGS -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
+ --extra-cflags="$RPM_OPT_FLAGS -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
--disable-oss-audio \
%{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
%{?_with_amr:--enable-amr} \
@@ -215,9 +209,9 @@
}
# Parallele build will fail
-make all
+make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
#{?_smp_mflags}
-make sggen
+make sggen OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
#{?_smp_mflags}
## kwizart - build doxygen doc for devel
@@ -236,7 +230,7 @@
install -m 755 bin/gcc/nposmozilla.xpt $RPM_BUILD_ROOT%{_libdir}/mozilla/components/nposmozilla.xpt
}
-%if %{with_osmo}
+%{?_with_osmo:
# Desktop menu Osmo4
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
cat > %{osmo}.desktop <<EOF
@@ -260,9 +254,10 @@
#icons
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -pm 0644 applications/osmo4_wx/osmo4.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{osmo}.xpm
-%else
+}
+%{?!_with_osmo:
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
-%endif
+}
## kwizart - rpmlint gpac no-ldconfig-symlink
ln -sf libgpac.so.%{version}-DEV $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
@@ -277,7 +272,6 @@
#Fix doxygen timestamp
touch -r Changelog doc/html/*
-touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
%clean
@@ -291,8 +285,11 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS Changelog COPYING README TODO
-%{_bindir}/MP4*
-%{_bindir}/*Gen
+%{_bindir}/MP4Box
+%{_bindir}/MP4Client
+%{_bindir}/MPEG4Gen
+%{_bindir}/SVGGen
+%{_bindir}/X3DGen
%{_datadir}/gpac/
%{_mandir}/man1/*.1.*
@@ -301,14 +298,14 @@
%{_libdir}/libgpac.so.*
%{_libdir}/gpac/
-%if %{with_osmo}
+%{?_with_osmo:
%files -n %{osmo}
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING README TODO
%{_bindir}/Osmo4
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{osmo}.xpm
-%endif
+}
%{?_with_mozilla:
%files -n mozilla-%{osmo}
@@ -333,6 +330,17 @@
%changelog
+* Sat May 29 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0.4.6-0.7cvs20100116
+- Rewrite soname patch that is still needed.
+- Allow --with osmo conditional
+- Explicitely list binaries.
+
+* Thu May 27 2010 Lucas Jacobs <lucas.jacobs(a)mines.sdsmt.edu> - 0.4.6-0.6cvs20100527
+- Update to 20100527
+- Removed upstreamed lib64, soname, OpenJPEG, OpenGL patches
+- Update ffmpeg, makefix and amr patches
+- Added patch to build osmo4_wx properly
+
* Sat Mar 13 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0.4.6-0.5.cvs20100116
- Fix CFLAGS for large files rfbz#1116
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 17 Jan 2010 00:43:58 -0000 1.5
+++ sources 29 May 2010 14:10:47 -0000 1.6
@@ -1 +1 @@
-6090746dc1e63b30186029acd390d6cb gpac-20100116.tar.bz2
+4f715901107857505334dbf9e5975f4c gpac-20100527.tar.bz2
--- gpac-0.4.5-lib64.patch DELETED ---
--- gpac-0.4.5-shared_sggen.patch DELETED ---
--- gpac-0.4.5-soname.patch DELETED ---
--- gpac-0.4.5-system_openjpeg.patch DELETED ---
--- gpac-0.4.6-ogl_libs.patch DELETED ---
13 years, 11 months
rpms/pushover/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/pushover/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsHU7873/rpms/pushover/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module pushover
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: pushover
# $Id: Makefile,v 1.1 2010/05/29 11:44:50 kwizart Exp $
NAME := pushover
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, 11 months
rpms/pushover Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/pushover
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsHU7873/rpms/pushover
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module pushover
--- NEW FILE Makefile ---
# Top level Makefile for module pushover
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, 11 months
rpms/pushover/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/pushover/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsHU7873/rpms/pushover/devel
Log Message:
Directory /cvs/nonfree/rpms/pushover/devel added to the repository
13 years, 11 months
rpms/pushover - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/pushover
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsHU7873/rpms/pushover
Log Message:
Directory /cvs/nonfree/rpms/pushover added to the repository
13 years, 11 months
rpms/mess/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/mess/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsKk7295/rpms/mess/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module mess
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: mess
# $Id: Makefile,v 1.1 2010/05/29 11:42:22 kwizart Exp $
NAME := mess
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, 11 months