rpms/mythweb - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mythweb
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsy30781/rpms/mythweb
Log Message:
Directory /cvs/free/rpms/mythweb added to the repository
11 years, 10 months
rpms/mythweb/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mythweb/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsy30781/rpms/mythweb/devel
Log Message:
Directory /cvs/free/rpms/mythweb/devel added to the repository
11 years, 10 months
rpms/vlc/devel vlc.spec, 1.155, 1.156 vlc-1.1.8-bugfix.opencv22.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13737/devel
Modified Files:
vlc.spec
Removed Files:
vlc-1.1.8-bugfix.opencv22.patch
Log Message:
Rework BR
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- vlc.spec 29 Jun 2012 09:57:24 -0000 1.155
+++ vlc.spec 4 Jul 2012 16:44:29 -0000 1.156
@@ -1,5 +1,5 @@
#global vlc_rc -rc1
-%global _with_bootstrap 1
+#global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
%global _with_a52dec --with-a52dec
@@ -15,19 +15,24 @@
%global _with_xvidcore --with-xvidcore
%global _with_live555 --with-live555
%global _with_vaapi --with-vaapi
-%global _without_opencv 1
+%endif
+%if 0%{?fedora}
+%global _with_fluidsyth 1
+%global _with_bluray 1
+%global _with_crystalhd 1
+%global _with_projectm 1
+%global _with_schroedinger 1
%endif
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 2.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
-Patch5: vlc-1.1.8-bugfix.opencv22.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -51,7 +56,7 @@
%{?_with_faad2:BuildRequires: faad2-devel}
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0}
BuildRequires: flac-devel
-BuildRequires: fluidsynth-devel
+%{?_with_fluidsynth:BuildRequires: fluidsynth-devel}
BuildRequires: fribidi-devel
%{?_with_gnomevfs:BuildRequires: gnome-vfs2-devel}
BuildRequires: gnutls-devel >= 1.0.17
@@ -61,11 +66,11 @@
BuildRequires: game-music-emu-devel
BuildRequires: libavc1394-devel
BuildRequires: libass-devel >= 0.9.7
-BuildRequires: libbluray-devel
+%{?_with_bluray:BuildRequires: libbluray-devel >= 0.2.1}
BuildRequires: libcaca-devel
BuildRequires: libcddb-devel
BuildRequires: libcdio-devel >= 0.77-3
-BuildRequires: libcrystalhd-devel
+%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
BuildRequires: libdc1394-devel >= 2.1.0
%{?_with_libdca:BuildRequires: libdca-devel}
BuildRequires: libdv-devel
@@ -80,10 +85,9 @@
BuildRequires: libmp4v2-devel
BuildRequires: libmpcdec-devel
BuildRequires: libmtp-devel >= 1.0.0
-BuildRequires: libprojectM-qt-devel
+%{?_with_projectm:BuildRequires: libprojectM-qt-devel}
BuildRequires: libproxy-devel
BuildRequires: librsvg2-devel >= 2.9.0
-BuildRequires: librtmp-devel
BuildRequires: libssh2-devel
BuildRequires: libsysfs-devel
BuildRequires: libshout-devel
@@ -99,7 +103,7 @@
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: lirc-devel
-%{?_with_live555:BuildRequires: live555-devel >= 0-0.33.2011.12.23}
+%{?_with_live555:BuildRequires: live555-devel >= 0-0.33}
BuildRequires: kernel-headers
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
@@ -110,15 +114,16 @@
BuildRequires: minizip-devel
%{?_with_libmpeg2:BuildRequires: mpeg2dec-devel >= 0.3.2}
BuildRequires: ncurses-devel
-%{!?_without_opencv:BuildRequires: opencv-devel}
+%{?_with_opencv:BuildRequires: opencv-devel}
BuildRequires: openslp-devel
BuildRequires: pcre-devel
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
BuildRequires: qt4-devel >= 4.5.2
-BuildRequires: schroedinger-devel
+%{?_with_schroedinger:BuildRequires: schroedinger-devel >= 1.0.10}
BuildRequires: sqlite-devel
BuildRequires: SDL_image-devel
+%{?_with_sidplay:BuildRequires: sidplay-libs-devel}
BuildRequires: speex-devel >= 1.1.5
BuildRequires: taglib-devel
%{?_with_twolame:BuildRequires: twolame-devel}
@@ -146,13 +151,9 @@
Requires: vlc-core%{_isa} = %{version}-%{release}
Requires: kde-filesystem
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: dejavu-sans-fonts
Requires: dejavu-sans-mono-fonts
Requires: dejavu-serif-fonts
-%else
-Requires: dejavu-fonts
-%endif
Requires: qt4%{?_isa} >= %{_qt4_version}
#For xdg-sreensaver
@@ -208,9 +209,6 @@
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc}
-%if 0%{?fedora} >= 15
-%patch5 -p1 -b .opencv22
-%endif
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -227,15 +225,13 @@
--disable-rpath \
--with-binary-version=%{version} \
--with-tuning=no \
-%if 0%{?fedora} > 14
--disable-notify \
-%endif
--with-kde-solid=%{_kde4_appsdir}/solid/actions \
%{?_with_ffmpeg:--enable-switcher} \
--enable-lua \
- --enable-live555 \
+%{?_with_live555:--enable-live555} \
--enable-dv \
-%{!?_without_opencv:--enable-opencv} \
+%{?_with_opencv:--enable-opencv} \
--enable-sftp \
--enable-pvr \
%{?_with_gnomevfs:--enable-gnomevfs} \
@@ -259,7 +255,8 @@
--enable-dirac \
--enable-libass \
--enable-shout \
- --enable-xcb \
+%{?_with_xcb:--enable-xcb --enable-xvideo} \
+%{!?_with_xcb:--disable-xcb --disable-xvideo} \
--enable-svg \
%{!?_without_directfb:--enable-directfb} \
--enable-aa \
@@ -391,19 +388,23 @@
%{?_with_gnomevfs:
%{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
}
+%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
+%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
+%{?_with_xcb:
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%if 0%{?fedora} < 17
%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
%endif
-%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
-%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
+}
+%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
+%{?_with_projectm:
%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
+}
%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
%files core -f %{name}.lang
@@ -421,13 +422,16 @@
%exclude %{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
}
%exclude %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
-%exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%{?_with_vcdimager:
%exclude %{_libdir}/vlc/plugins/access/libvcd_plugin.so
%exclude %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
%exclude %{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
}
+%{?_with_fluidsynth:
%exclude %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
+}
+%{?_with_xcb:
+%exclude %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%if 0%{?fedora} < 17
%exclude %{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
%endif
@@ -437,16 +441,19 @@
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
+%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
+}
%{!?_without_directfb:
%exclude %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
-%{!?_without_opencv:
+%{?_with_opencv:
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
}
-%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
+%{?_with_projectm:
%exclude %{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
+}
%exclude %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
%exclude %{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.so
%exclude %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
@@ -458,14 +465,16 @@
%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{_libdir}/vlc/plugins/audio_output/libportaudio_plugin.so
%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
+%{?_with_fluidsynth:
%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
+}
%files extras
%defattr(-,root,root,-)
%{!?_without_directfb:
%{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
-%{!?_without_opencv:
+%{?_with_opencv:
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
}
@@ -486,6 +495,10 @@
%changelog
+* Wed Jul 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.2-2
+- Rework BR and RPM conditionals
+- Drop support for anything below EL-6 and current Fedora.
+
* Thu Jun 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.2-1
- Update to 2.0.2
--- vlc-1.1.8-bugfix.opencv22.patch DELETED ---
11 years, 10 months
rpms/audacity-freeworld/devel audacity-2.0.1-desktop.in.patch, NONE, 1.1 audacity-2.0.1-libmp3lame-default.patch, NONE, 1.1 audacity-freeworld.spec, 1.24, 1.25 audacity-1.3.13-desktop.in.patch, 1.1, NONE audacity-1.3.7-libmp3lame-default.patch, 1.1, NONE
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3622
Modified Files:
audacity-freeworld.spec
Added Files:
audacity-2.0.1-desktop.in.patch
audacity-2.0.1-libmp3lame-default.patch
Removed Files:
audacity-1.3.13-desktop.in.patch
audacity-1.3.7-libmp3lame-default.patch
Log Message:
- update to 2.0.1 final
- rebase libmp3lame-default.patch
- rebase desktop.in.patch
audacity-2.0.1-desktop.in.patch:
audacity.desktop.in | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
--- NEW FILE audacity-2.0.1-desktop.in.patch ---
--- audacity-src-2.0.1/src/audacity.desktop.in 2012-06-26 07:27:46.000000000 +1000
+++ audacity-src-2.0.0/src/audacity.desktop.in 2012-07-04 22:11:31.000000000 +1000
@@ -5,16 +5,17 @@
GenericName=Sound Editor
GenericName[de]=Audio-Editor
GenericName[ru]=Редактор звуковых файлов
-Comment=Record and edit audio files
+Comment=Record and edit audio files with multitrack capability
Comment[de]=Audio-Dateien aufnehmen und bearbeiten
Comment[ru]=Запись и редактирование звуковых файлов
Icon=@AUDACITY_NAME@
Type=Application
-Categories=AudioVideo;Audio;AudioVideoEditing;
+Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing;
Exec=@AUDACITY_NAME@ %F
-StartupNotify=false
+StartupNotify=true
+StartupWMClass=Audacity
Terminal=false
-MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
+MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/x-mp3;audio/x-wav;application/x-audacity-project;audio/midi;audio/x-flac;
audacity-2.0.1-libmp3lame-default.patch:
AudacityApp.cpp | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE audacity-2.0.1-libmp3lame-default.patch ---
diff -Nur audacity-src-2.0.0/src/AudacityApp.cpp audacity-src-2.0.1/src/AudacityApp.cpp
--- audacity-src-2.0.0/src/AudacityApp.cpp 2012-07-03 20:49:56.494204862 +1000
+++ audacity-src-2.0.1/src/AudacityApp.cpp 2012-07-03 20:46:51.994199900 +1000
@@ -1172,6 +1172,8 @@
return false;
}
+ gPrefs->Write(wxT("/MP3/MP3LibPath"), wxT("__RPM_LIBDIR__/libmp3lame.so.0"));
+
// More initialization
#ifdef CLEANSPEECH
InitCleanSpeech();
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- audacity-freeworld.spec 14 Mar 2012 22:23:49 -0000 1.24
+++ audacity-freeworld.spec 4 Jul 2012 14:01:00 -0000 1.25
@@ -3,7 +3,7 @@
Name: audacity-freeworld
-Version: 2.0.0
+Version: 2.0.1
Release: 1%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
@@ -18,13 +18,13 @@
Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.bz2
%define tartopdir audacity-src-%{version}
-Patch1: audacity-1.3.7-libmp3lame-default.patch
+Patch1: audacity-2.0.1-libmp3lame-default.patch
Patch2: audacity-1.3.9-libdir.patch
# add audio/x-flac
# remove audio/mpeg, audio/x-mp3
# enable startup notification
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
-Patch3: audacity-1.3.13-desktop.in.patch
+Patch3: audacity-2.0.1-desktop.in.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -85,7 +85,7 @@
sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
done
-%patch3 -b .desktop.old
+%patch3 -p1 -b .desktop.old
%build
@@ -156,6 +156,14 @@
%changelog
+* Tue Jul 3 2012 David Timms <iinet.net.au@dtimms> - 2.0.1-1
+- update to 2.0.1 final
+- rebase libmp3lame-default.patch
+- rebase desktop.in.patch
+
+* Wed Jun 26 2012 David Timms <iinet.net.au@dtimms> - 2.0.1-0.1.rc2
+- update to 2.0.1 release candidate 2
+
* Wed Mar 14 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-1
- update to 2.0.0 final
--- audacity-1.3.13-desktop.in.patch DELETED ---
--- audacity-1.3.7-libmp3lame-default.patch DELETED ---
11 years, 10 months
rpms/gpac/EL-6 gpac-0.5.0-libdir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gpac-snapshot.sh, 1.1, 1.2 gpac.spec, 1.30, 1.31 sources, 1.6, 1.7 gpac-0.4.6-ffmpeg.patch, 1.3, NONE gpac-0.4.6-js_cflags.patch, 1.1, NONE gpac-0.4.6-makefix.patch, 1.2, NONE gpac-0.4.6-noldflag.patch, 1.1, NONE gpac-0.4.6-osmo.patch, 1.1, NONE gpac-0.4.6-soname.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26927/EL-6
Modified Files:
.cvsignore gpac-snapshot.sh gpac.spec sources
Added Files:
gpac-0.5.0-libdir.patch
Removed Files:
gpac-0.4.6-ffmpeg.patch gpac-0.4.6-js_cflags.patch
gpac-0.4.6-makefix.patch gpac-0.4.6-noldflag.patch
gpac-0.4.6-osmo.patch gpac-0.4.6-soname.patch
Log Message:
Update to 0.5.0
gpac-0.5.0-libdir.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gpac-0.5.0-libdir.patch ---
diff -up gpac/configure.libdir gpac/configure
--- gpac/configure.libdir 2012-06-23 17:35:19.000000000 +0200
+++ gpac/configure 2012-06-23 19:12:16.815152617 +0200
@@ -2932,7 +2932,7 @@ echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) -c
#pkg-config
echo "prefix=$prefix" > gpac.pc
echo "exec_prefix=\${prefix}" >> gpac.pc
-echo "libdir=\${exec_prefix}/lib" >> gpac.pc
+echo "libdir=\${exec_prefix}/$libdir" >> gpac.pc
echo "includedir=\${exec_prefix}/include" >> gpac.pc
echo "" >> gpac.pc
echo "Name: gpac" >> gpac.pc
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/EL-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 29 May 2010 14:10:47 -0000 1.6
+++ .cvsignore 4 Jul 2012 11:44:22 -0000 1.7
@@ -1 +1 @@
-gpac-20100527.tar.bz2
+gpac-0.5.0.tar.gz
Index: gpac-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/gpac/EL-6/gpac-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-snapshot.sh 3 Aug 2008 14:29:51 -0000 1.1
+++ gpac-snapshot.sh 4 Jul 2012 11:44:22 -0000 1.2
@@ -12,12 +12,13 @@
unset CDPATH
pwd=$(pwd)
-cvs=$(date +%Y%m%d)
+svn=$(date +%Y%m%d)
cd "$tmp"
-cvs -z3 -d:pserver:anonymous@gpac.cvs.sourceforge.net:/cvsroot/gpac co -P gpac
-find . -type d -name CVS -print0 | xargs -0r rm -rf
-chmod 755 gpac/configure
+svn co http://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac gpac
+revision=$(svnversion gpac)
+echo "#define GPAC_SVN_REVISION \"$revision\"" > gpac/include/gpac/version.h
+find gpac -name '.svn' -type d -exec rm -rf {} ';' || :
rm -rf gpac/extra_lib/
-tar jcf "$pwd"/gpac-$cvs.tar.bz2 gpac
+tar jcf "$pwd"/gpac-$svn.tar.bz2 gpac
cd - >/dev/null
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/EL-6/gpac.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gpac.spec 4 Jan 2012 22:12:46 -0000 1.30
+++ gpac.spec 4 Jul 2012 11:44:22 -0000 1.31
@@ -7,7 +7,7 @@
# - Fix unused-direct-shlib-dependency on libgpac
%global osmo Osmo4
-%global cvs 20100527
+#global svn 20120623
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
%global geckover 2.0.0
@@ -16,23 +16,15 @@
Name: gpac
Summary: MPEG-4 multimedia framework
-Version: 0.4.6
-Release: 0.13.cvs%{?cvs}%{?dist}.3
+Version: 0.5.0
+Release: 1%{?svn}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
-#Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
-Source0: http://rpms.kwizart.net/fedora/SOURCE/gpac-%{cvs}.tar.bz2
+Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
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.6-soname.patch
+Patch1: gpac-0.5.0-libdir.patch
Patch2: gpac-0.4.5-amr.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
-Patch11: gpac-0.4.6-osmo.patch
-Patch12: gpac-0.4.6-noldflag.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
@@ -42,16 +34,16 @@
BuildRequires: libGLU-devel
BuildRequires: freeglut-devel
BuildRequires: freetype-devel >= 2.1.4
-#BuildRequires: faad2-devel
+BuildRequires: faad2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 1.2.5
BuildRequires: libmad-devel
BuildRequires: xvidcore-devel >= 1.0.0
-#BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-devel
BuildRequires: js-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
-#BuildRequires: openjpeg-devel
+BuildRequires: openjpeg-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: zlib-devel
BuildRequires: libogg-devel libvorbis-devel libtheora-devel
@@ -59,7 +51,7 @@
BuildRequires: libXpm-devel
BuildRequires: libXv-devel
BuildRequires: wxGTK-devel
-#BuildRequires: xmlrpc-c-devel
+BuildRequires: xmlrpc-c-devel
%{?_with_mozilla:BuildRequires: gecko-devel}
BuildRequires: doxygen
BuildRequires: desktop-file-utils
@@ -148,18 +140,8 @@
%prep
%setup -q -n gpac
-%patch0 -p1 -b .makefix
-%patch1 -p1 -b .soname
+%patch1 -p1 -b .libdir
%patch2 -p1 -b .amr
-%patch5 -p1 -b .jscflags
-%patch9 -p1 -b .ffmpeg
-%patch11 -p1 -b .osmo
-%patch12 -p1 -b .noldflag
-
-## kwizart - enable dynamic mode - hardcoded with patch2
-# define SONAME number from the first number of gpac version.
-#define soname libgpac.so.0
-#sed -i.soname -e 's|EXTRALIBS+=$(GPAC_SH_FLAGS)|EXTRALIBS+=$(GPAC_SH_FLAGS)\nLDFLAGS+="-Wl,-soname,%{soname}"|' src/Makefile
# Fix encoding warnings
cp -p Changelog Changelog.origine
@@ -176,12 +158,17 @@
%build
%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" \
+ --X11-path=%{_prefix} \
+ --libdir=%{_lib} \
--disable-oss-audio \
%{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
%{?_with_amr:--enable-amr} \
- --disable-static
+ --disable-static \
+ --use-js=no
+
+#Avoid mess with setup.h
+cp -p config.h include/gpac
##
## Osmo-zila plugin.
@@ -224,7 +211,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install install-lib
+make DESTDIR=$RPM_BUILD_ROOT install install-lib INSTFLAGS="-p"
%{?_with_mozilla:
## kwizart - Install osmozilla plugin - make instmoz disabled.
@@ -262,12 +249,9 @@
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
}
-## kwizart - rpmlint gpac no-ldconfig-symlink
-ln -sf libgpac.so.%{version}-DEV $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
-ln -sf libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
-
#Install generated sggen binaries
-for b in MPEG4 SVG X3D; do
+#for b in MPEG4 SVG X3D; do
+for b in MPEG4 X3D; do
pushd applications/generators/${b}
install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir}
popd
@@ -277,7 +261,12 @@
touch -r Changelog doc/html/*
#config.h like but not only
-touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
+#Usual multilib bug https://bugzilla.rpmfusion.org/show_bug.cgi?id=270
+sed -i -e '/GPAC_CONFIGURATION/d' $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/*.h
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/internal/*.h
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h
+rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h
%clean
@@ -294,7 +283,7 @@
%{_bindir}/MP4Box
%{_bindir}/MP4Client
%{_bindir}/MPEG4Gen
-%{_bindir}/SVGGen
+#{_bindir}/SVGGen
%{_bindir}/X3DGen
%{_datadir}/gpac/
%{_mandir}/man1/*.1.*
@@ -336,6 +325,28 @@
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.0-1
+- Update to 0.5.0
+
+* Wed Feb 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.19.svn20110923
+- Rebuilt for x264/FFmpeg
+
+* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.18.svn20110923
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.17.svn20110923
+- Update gpac-soname.patch
+
+* Fri Sep 23 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.16svn20110923
+- Update to 20110923
+- Fix svnversion
+
+* Thu Sep 22 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.15svn20110915
+- Update to 20110915
+
+* Thu Jul 14 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.14.cvs20100527
+- Rebuild
+
* Sun Jun 05 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.13.cvs20100527
- Rebuild for js update
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/EL-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 29 May 2010 14:10:47 -0000 1.6
+++ sources 4 Jul 2012 11:44:22 -0000 1.7
@@ -1 +1 @@
-4f715901107857505334dbf9e5975f4c gpac-20100527.tar.bz2
+19f7bb7c16913c22bdd453db1e653ca0 gpac-0.5.0.tar.gz
--- gpac-0.4.6-ffmpeg.patch DELETED ---
--- gpac-0.4.6-js_cflags.patch DELETED ---
--- gpac-0.4.6-makefix.patch DELETED ---
--- gpac-0.4.6-noldflag.patch DELETED ---
--- gpac-0.4.6-osmo.patch DELETED ---
--- gpac-0.4.6-soname.patch DELETED ---
11 years, 10 months
rpms/gpac/F-17 gpac-0.5.0-libdir.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 gpac-snapshot.sh, 1.3, 1.4 gpac.spec, 1.35, 1.36 sources, 1.8, 1.9 gpac-0.4.6-js_cflags.patch, 1.1, NONE gpac-0.4.6_15-soname.patch, 1.2, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26571/F-17
Modified Files:
.cvsignore gpac-snapshot.sh gpac.spec sources
Added Files:
gpac-0.5.0-libdir.patch
Removed Files:
gpac-0.4.6-js_cflags.patch gpac-0.4.6_15-soname.patch
Log Message:
Update to 0.5.0
gpac-0.5.0-libdir.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gpac-0.5.0-libdir.patch ---
diff -up gpac/configure.libdir gpac/configure
--- gpac/configure.libdir 2012-06-23 17:35:19.000000000 +0200
+++ gpac/configure 2012-06-23 19:12:16.815152617 +0200
@@ -2932,7 +2932,7 @@ echo ' $(CC) $(CFLAGS) $(PIC_CFLAGS) -c
#pkg-config
echo "prefix=$prefix" > gpac.pc
echo "exec_prefix=\${prefix}" >> gpac.pc
-echo "libdir=\${exec_prefix}/lib" >> gpac.pc
+echo "libdir=\${exec_prefix}/$libdir" >> gpac.pc
echo "includedir=\${exec_prefix}/include" >> gpac.pc
echo "" >> gpac.pc
echo "Name: gpac" >> gpac.pc
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/F-17/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 23 Sep 2011 07:31:40 -0000 1.8
+++ .cvsignore 4 Jul 2012 11:43:37 -0000 1.9
@@ -1 +1 @@
-gpac-20110923.tar.bz2
+gpac-0.5.0.tar.gz
Index: gpac-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/gpac/F-17/gpac-snapshot.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gpac-snapshot.sh 23 Sep 2011 07:31:41 -0000 1.3
+++ gpac-snapshot.sh 4 Jul 2012 11:43:37 -0000 1.4
@@ -18,7 +18,7 @@
svn co http://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac gpac
revision=$(svnversion gpac)
echo "#define GPAC_SVN_REVISION \"$revision\"" > gpac/include/gpac/version.h
-find gpac -name '.svn' -type d -exec rm -rf {} ';'
+find gpac -name '.svn' -type d -exec rm -rf {} ';' || :
rm -rf gpac/extra_lib/
tar jcf "$pwd"/gpac-$svn.tar.bz2 gpac
cd - >/dev/null
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/F-17/gpac.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gpac.spec 26 Feb 2012 11:46:13 -0000 1.35
+++ gpac.spec 4 Jul 2012 11:43:37 -0000 1.36
@@ -7,7 +7,7 @@
# - Fix unused-direct-shlib-dependency on libgpac
%global osmo Osmo4
-%global svn 20110923
+#global svn 20120623
# Mozilla stuff fails. It's completely disabled for now.
%global mozver 3.0
%global geckover 2.0.0
@@ -16,17 +16,15 @@
Name: gpac
Summary: MPEG-4 multimedia framework
-Version: 0.4.6
-Release: 0.19.svn%{?svn}%{?dist}
+Version: 0.5.0
+Release: 1%{?svn}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
-#Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
-Source0: http://rpms.kwizart.net/fedora/SOURCE/gpac-%{svn}.tar.bz2
+Source0: http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
Source9: gpac-snapshot.sh
-Patch1: gpac-0.4.6_15-soname.patch
+Patch1: gpac-0.5.0-libdir.patch
Patch2: gpac-0.4.5-amr.patch
-Patch5: gpac-0.4.6-js_cflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
@@ -45,7 +43,7 @@
BuildRequires: js-devel
BuildRequires: libxml2-devel
BuildRequires: openssl-devel
-#BuildRequires: openjpeg-devel
+BuildRequires: openjpeg-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: zlib-devel
BuildRequires: libogg-devel libvorbis-devel libtheora-devel
@@ -142,14 +140,8 @@
%prep
%setup -q -n gpac
-%patch1 -p1 -b .soname
+%patch1 -p1 -b .libdir
%patch2 -p1 -b .amr
-%patch5 -p1 -b .jscflags
-
-## kwizart - enable dynamic mode - hardcoded with patch2
-# define SONAME number from the first number of gpac version.
-#define soname libgpac.so.0
-#sed -i.soname -e 's|EXTRALIBS+=$(GPAC_SH_FLAGS)|EXTRALIBS+=$(GPAC_SH_FLAGS)\nLDFLAGS+="-Wl,-soname,%{soname}"|' src/Makefile
# Fix encoding warnings
cp -p Changelog Changelog.origine
@@ -166,12 +158,17 @@
%build
%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" \
+ --X11-path=%{_prefix} \
+ --libdir=%{_lib} \
--disable-oss-audio \
%{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
%{?_with_amr:--enable-amr} \
- --disable-static
+ --disable-static \
+ --use-js=no
+
+#Avoid mess with setup.h
+cp -p config.h include/gpac
##
## Osmo-zila plugin.
@@ -252,17 +249,9 @@
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
}
-#hack
-%if %{_lib} == "lib64"
- mv $RPM_BUILD_ROOT%{_prefix}/lib $RPM_BUILD_ROOT%{_libdir}
-%endif
-
-## kwizart - rpmlint gpac no-ldconfig-symlink
-ln -sf libgpac.so.%{version}-DEV $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
-ln -sf libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
-
#Install generated sggen binaries
-for b in MPEG4 SVG X3D; do
+#for b in MPEG4 SVG X3D; do
+for b in MPEG4 X3D; do
pushd applications/generators/${b}
install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir}
popd
@@ -272,7 +261,12 @@
touch -r Changelog doc/html/*
#config.h like but not only
-touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
+#Usual multilib bug https://bugzilla.rpmfusion.org/show_bug.cgi?id=270
+sed -i -e '/GPAC_CONFIGURATION/d' $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/*.h
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/internal/*.h
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h
+rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h
%clean
@@ -289,7 +283,7 @@
%{_bindir}/MP4Box
%{_bindir}/MP4Client
%{_bindir}/MPEG4Gen
-%{_bindir}/SVGGen
+#{_bindir}/SVGGen
%{_bindir}/X3DGen
%{_datadir}/gpac/
%{_mandir}/man1/*.1.*
@@ -331,6 +325,9 @@
%changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.0-1
+- Update to 0.5.0
+
* Wed Feb 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.19.svn20110923
- Rebuilt for x264/FFmpeg
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/F-17/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 23 Sep 2011 07:31:41 -0000 1.8
+++ sources 4 Jul 2012 11:43:37 -0000 1.9
@@ -1 +1 @@
-32a1c81119b123d442fa7295d8b77d09 gpac-20110923.tar.bz2
+19f7bb7c16913c22bdd453db1e653ca0 gpac-0.5.0.tar.gz
--- gpac-0.4.6-js_cflags.patch DELETED ---
--- gpac-0.4.6_15-soname.patch DELETED ---
11 years, 10 months
rpms/west-chamber/devel west-chamber.spec,1.4,1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/west-chamber/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10101
Modified Files:
west-chamber.spec
Log Message:
Late rebuilt
Index: west-chamber.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber/devel/west-chamber.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- west-chamber.spec 28 Oct 2011 22:37:03 -0000 1.4
+++ west-chamber.spec 4 Jul 2012 07:47:02 -0000 1.5
@@ -4,7 +4,7 @@
Name: west-chamber
Summary: Extensions named after Romance of the West Chamber for iptables
Version: 0.0.1
-Release: 7.%{?svndate}svn%{?dist}
+Release: 8.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://code.google.com/p/scholarzhang/
@@ -61,6 +61,9 @@
%{_mandir}/man8/*
%changelog
+* Wed Jul 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-8.20101017svn
+- Rebuilt for late F-17 mass-rebuilt
+
* Sat Oct 29 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn
- Update for F-16
11 years, 10 months
rpms/west-chamber/F-17 west-chamber.spec,1.4,1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/west-chamber/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9781
Modified Files:
west-chamber.spec
Log Message:
Rebuilt
Index: west-chamber.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-17/west-chamber.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- west-chamber.spec 28 Oct 2011 22:37:03 -0000 1.4
+++ west-chamber.spec 4 Jul 2012 07:42:51 -0000 1.5
@@ -4,7 +4,7 @@
Name: west-chamber
Summary: Extensions named after Romance of the West Chamber for iptables
Version: 0.0.1
-Release: 7.%{?svndate}svn%{?dist}
+Release: 8.%{?svndate}svn%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://code.google.com/p/scholarzhang/
@@ -61,6 +61,9 @@
%{_mandir}/man8/*
%changelog
+* Wed Jul 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-8.20101017svn
+- Rebuilt for late F-17 mass-rebuilt
+
* Sat Oct 29 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.1-7.20101017svn
- Update for F-16
11 years, 10 months
rpms/normalize/devel normalize.spec,1.6,1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/normalize/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8884/devel
Modified Files:
normalize.spec
Log Message:
ERRATA - the .fc17 build was present
Index: normalize.spec
===================================================================
RCS file: /cvs/free/rpms/normalize/devel/normalize.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- normalize.spec 4 Jul 2012 07:22:46 -0000 1.6
+++ normalize.spec 4 Jul 2012 07:30:25 -0000 1.7
@@ -76,9 +76,6 @@
# The * here is for x86_64 build where a librva.a and a librva.la are builded
%changelog
-* Wed Jul 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.7-7
-- Rebuilt - missing mass rebuilt
-
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11 years, 10 months
rpms/normalize/F-17 normalize.spec,1.6,1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/normalize/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8884/F-17
Modified Files:
normalize.spec
Log Message:
ERRATA - the .fc17 build was present
Index: normalize.spec
===================================================================
RCS file: /cvs/free/rpms/normalize/F-17/normalize.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- normalize.spec 4 Jul 2012 07:22:21 -0000 1.6
+++ normalize.spec 4 Jul 2012 07:30:25 -0000 1.7
@@ -76,9 +76,6 @@
# The * here is for x86_64 build where a librva.a and a librva.la are builded
%changelog
-* Wed Jul 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.7-7
-- Rebuilt - missing mass rebuilt
-
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11 years, 10 months