rpms/streamripper/F-9 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 streamripper.spec, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/streamripper/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11171
Modified Files:
.cvsignore sources streamripper.spec
Log Message:
update from livna
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/streamripper/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 17:35:57 -0000 1.2
+++ .cvsignore 8 Aug 2008 18:32:45 -0000 1.3
@@ -1 +1 @@
-streamripper-1.62.3.tar.gz
+streamripper-1.63.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/streamripper/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 17:35:57 -0000 1.2
+++ sources 8 Aug 2008 18:32:45 -0000 1.3
@@ -1 +1 @@
-127eb52355d0d10183ee22c44b5a9039 streamripper-1.62.3.tar.gz
+73a63383dca00615c3328cf51bf2fa56 streamripper-1.63.5.tar.gz
Index: streamripper.spec
===================================================================
RCS file: /cvs/free/rpms/streamripper/F-9/streamripper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamripper.spec 3 Aug 2008 17:35:57 -0000 1.1
+++ streamripper.spec 8 Aug 2008 18:32:45 -0000 1.2
@@ -1,7 +1,7 @@
Summary: Shoutcast and icecast compatible streams recorder
Name: streamripper
-Version: 1.62.3
-Release: 8%{?dist}
+Version: 1.63.5
+Release: 2%{?dist}
Group: Applications/Multimedia
URL: http://streamripper.sourceforge.net/
License: GPLv2
@@ -59,30 +59,32 @@
rm -rf %{buildroot}
%changelog
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.62.3-8
-- rebuild
+* Fri Aug 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.63.5-2
+- rebuild for RPM Fusion
+
+* Fri Aug 08 2008 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.63.5-1
+- New streamripper release
* Sat Nov 24 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.62.3-7
- rebuilt
-
-* Mon Sep 03 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.3-6
+* Mon Sep 03 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.3-6
- New streamripper release
-* Sat Sep 01 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.2-5
+* Sat Sep 01 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.2-5
- Force Makefile to search lib in _libdir
- Add INSTALL="install -p -c" for make install
-* Mon Aug 13 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.2-4
+* Mon Aug 13 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.2-4
- New release of streamripper
- Spec clean-up
-* Thu Aug 9 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.1-3
+* Thu Aug 9 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.1-3
- Force to use external tre lib.
-* Wed Aug 8 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.1-2
+* Wed Aug 8 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.1-2
- Convert man page to UTF8
- Add streamripper-vswprintf-no-redef.patch
-* Wed Aug 8 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.1-1
+* Wed Aug 8 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.1-1
- Initial Fedora release
16 years, 2 months
- 1
- 0
rpms/streamripper/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 streamripper.spec, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/streamripper/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11136
Modified Files:
.cvsignore sources streamripper.spec
Log Message:
update from livna
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/streamripper/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 14:56:06 -0000 1.2
+++ .cvsignore 8 Aug 2008 18:32:22 -0000 1.3
@@ -1 +1 @@
-streamripper-1.62.3.tar.gz
+streamripper-1.63.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/streamripper/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 14:56:06 -0000 1.2
+++ sources 8 Aug 2008 18:32:22 -0000 1.3
@@ -1 +1 @@
-127eb52355d0d10183ee22c44b5a9039 streamripper-1.62.3.tar.gz
+73a63383dca00615c3328cf51bf2fa56 streamripper-1.63.5.tar.gz
Index: streamripper.spec
===================================================================
RCS file: /cvs/free/rpms/streamripper/devel/streamripper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamripper.spec 3 Aug 2008 14:56:06 -0000 1.1
+++ streamripper.spec 8 Aug 2008 18:32:22 -0000 1.2
@@ -1,7 +1,7 @@
Summary: Shoutcast and icecast compatible streams recorder
Name: streamripper
-Version: 1.62.3
-Release: 8%{?dist}
+Version: 1.63.5
+Release: 2%{?dist}
Group: Applications/Multimedia
URL: http://streamripper.sourceforge.net/
License: GPLv2
@@ -59,30 +59,32 @@
rm -rf %{buildroot}
%changelog
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.62.3-8
-- rebuild
+* Fri Aug 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.63.5-2
+- rebuild for RPM Fusion
+
+* Fri Aug 08 2008 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.63.5-1
+- New streamripper release
* Sat Nov 24 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.62.3-7
- rebuilt
-
-* Mon Sep 03 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.3-6
+* Mon Sep 03 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.3-6
- New streamripper release
-* Sat Sep 01 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.2-5
+* Sat Sep 01 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.2-5
- Force Makefile to search lib in _libdir
- Add INSTALL="install -p -c" for make install
-* Mon Aug 13 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.2-4
+* Mon Aug 13 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.2-4
- New release of streamripper
- Spec clean-up
-* Thu Aug 9 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.1-3
+* Thu Aug 9 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.1-3
- Force to use external tre lib.
-* Wed Aug 8 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.1-2
+* Wed Aug 8 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.1-2
- Convert man page to UTF8
- Add streamripper-vswprintf-no-redef.patch
-* Wed Aug 8 2007 Patrice Bouchand <patrice.bouchand.fedora(a)gmail.com> 1.62.1-1
+* Wed Aug 8 2007 Patrice Bouchand <patrice[DOT]bouchand[DOT]fedora[AT]gmail[DOT]com> 1.62.1-1
- Initial Fedora release
16 years, 2 months
- 1
- 0
rpms/libquicktime/devel libquicktime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10049
Modified Files:
.cvsignore sources
Added Files:
libquicktime.spec
Log Message:
initial import from livna
--- NEW FILE libquicktime.spec ---
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.0.3
Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdv-devel
BuildRequires: libpng-devel libjpeg-devel libGLU-devel
BuildRequires: libvorbis-devel ffmpeg-devel
BuildRequires: lame-devel alsa-lib-devel libXt-devel libXaw-devel libXv-devel
BuildRequires: libdv-devel >= 0.102-4 x264-devel faac-devel faad2-devel
BuildRequires: libavc1394-devel libraw1394-devel >= 0.9.0-12
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: gettext-devel
BuildRequires: libtool
%package utils
Summary: Utilities for working with Quicktime files
Group: Applications/Multimedia
%package devel
Summary: Development files for libquicktime
Group: Development/Libraries
Requires: %{name} = %{version}-%{release} zlib-devel pkgconfig
# --------------------------------------------------------------------
%description
Libquicktime is based on the quicktime4linux library with several
enhancements. All 3rd-party libraries were removed from the
sourcetree. Instead, the systemwide installed libraries are detected
by the configure script. All original codecs were moved into
dynamically loadable modules, and new codecs are in
development. Libquicktime is source-compatible with
quicktime4linux. Special API extensions allow access to the codec
registry and more convenient processing of Audio and Video
data.
%description utils
Libquicktime is based on the quicktime4linux library with several
enhancements. This package contains utility programs and additional
tools, like a commandline player and a GTK configuration utility which
can configure the parameters of all installed codecs.
%description devel
Libquicktime is based on the quicktime4linux library with several
enhancements. This package contains development files for %{name}.
# --------------------------------------------------------------------
%prep
%setup -q
# regenerate configure to disable rpath
autoreconf -f -i
# --------------------------------------------------------------------
%build
%configure \
--enable-gpl \
--disable-rpath \
--with-cpuflags="$RPM_OPT_FLAGS" \
--disable-dependency-tracking \
--without-doxygen \
--disable-static \
--with-libdv \
--enable-libswscale \
%ifarch i686 athlon pentium3 pentium4 x86_64 ia64
--enable-mmx \
%else
--disable-mmx
%endif
make %{?_smp_mflags}
# --------------------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
%find_lang %{name}
# --------------------------------------------------------------------
%clean
rm -rf $RPM_BUILD_ROOT
# --------------------------------------------------------------------
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING README TODO
%{_libdir}/%{name}*.so.*
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/lqt_*.so
%files utils
%defattr(-,root,root,-)
%{_bindir}/libquicktime_config
%{_bindir}/lqt_transcode
%{_bindir}/lqtplay
%{_bindir}/qt2text
%{_bindir}/qtdechunk
%{_bindir}/qtdump
%{_bindir}/qtinfo
%{_bindir}/qtrechunk
%{_bindir}/qtstreamize
%{_bindir}/qtyuv4toyuv
%{_mandir}/man1/lqtplay.1*
%files devel
%defattr(-,root,root,-)
%{_bindir}/lqt-config
%{_includedir}/lqt/
%{_libdir}/pkgconfig/libquicktime.pc
%{_libdir}/%{name}*.so
%{_datadir}/aclocal/lqt.m4
# --------------------------------------------------------------------
%changelog
* Fri Aug 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0.3-3
- rebuild
* Thu Jul 17 2008 kwizart <kwizart at gmail.com> - 1.0.3-2
- Add BR libdv-devel and --with-dv
* Thu Jul 17 2008 kwizart <kwizart at gmail.com> - 1.0.3-1
- Update to 1.0.3
* Sat Jun 14 2008 kwizart <kwizart at gmail.com> - 1.0.2-3
- Enable libswscale
* Thu Feb 28 2008 kwizart <kwizart at gmail.com> - 1.0.2-2
- Rebuild for gcc43 and x264
* Sun Jan 13 2008 kwizart <kwizart at gmail.com> - 1.0.2-1
- Update to 1.0.2 (gcc43 compliant)
* Mon Oct 15 2007 kwizart <kwizart at gmail.com> - 1.0.1-1
- Update to 1.0.1
- Disable libswscale (disabled in ffmpeg).
* Wed Sep 26 2007 kwizart <kwizart at gmail.com> - 1.0.0-2
- Fix build for new tooltip with gtk 2.12
A better patch may need:
http://library.gnome.org/devel/gtk/unstable/gtk-migrating-tooltips.html
* Thu Jul 5 2007 kwizart <kwizart at gmail.com> - 1.0.0-1
- Update to 1.0.0
- Add BR gettext, libtool
- re-Run autogen.sh to prevent rpath issues...
- add patch from freshrpms.
* Fri Jan 5 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9.10-4
- Drop old ffmpeg (main) package dependency.
- Improve summary.
* Wed Nov 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.10-3
- Enable GPL plugins, x264 patch borrowed from freshrpms.
- Split utilities into -utils subpackage.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.9.10-2
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Sun Sep 24 2006 Dams <anvil[AT]livna.org> - 0.9.10-1
- Disabled some standard library paths in rpath with Ville help
- Explicitly disabling static objects building
* Wed Sep 20 2006 Dams <anvil[AT]livna.org> - 0.9.10-1
- Updated to 0.9.10
* Sat Apr 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.8-1
- 0.9.8.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Jan 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.7-0.lvn.9
- Rebuild against new ffmpeg.
- Drop no longer needed modular X build dep workarounds.
* Thu Dec 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.7-0.lvn.8
- Adapt to modular X11.
- Drop unneeded GTK1 build dependencies, BuildRequire fixed libdv-devel.
- Drop zero Epochs.
* Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0:0.9.7-0.lvn.7
- More clean-up for obsolete pre-FC2 support
* Tue Aug 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.7-0.lvn.6
- Quick hack to fix libavcodec detection with newer (>= 20050731) ffmpegs.
- Don't ship static libs.
* Mon Jul 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.7-0.lvn.5
- Clean up obsolete pre-FC2 support.
* Thu Jun 16 2005 Dams <anvil[AT]livna.org> - 0:0.9.7-0.lvn.4
- .... and gtk+-devel.
* Thu Jun 16 2005 Dams <anvil[AT]livna.org> - 0:0.9.7-0.lvn.3
- libdv-devel needs glib-devel (fedora core bug....)
* Mon Jun 13 2005 Dams <anvil[AT]livna.org> - 0:0.9.7-0.lvn.2
- Updated tarball
* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.7-0.lvn.1
- 0.9.7, MMX builds with gcc4 again.
* Sat May 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.6-0.lvn.1
- 0.9.6, aclocal18 patch applied upstream.
- Patch to compile with gcc4 (MMX build is borked though, build --without mmx).
- Use "make install DESTDIR=..." to avoid nasty rpaths.
* Thu Sep 2 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.3-0.lvn.2
- Make dv support conditional (default on), add minimum required libdv version.
- Make firewire support conditional again (only if dv support is available).
- Disable dependency tracking to speed up the build.
- Fix aclocal >= 1.8 warnings from lqt.m4.
- BuildRequire %%{_libdir}/libGLU.so.1.
* Mon Aug 30 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.3-0.lvn.1
- Update to 0.9.3.
- Enable ffmpeg plugin.
- Make firewire support unconditional.
- Fix 64bit libdir.
- Fix -devel dependencies.
- Update list of archs with MMX.
- Clean up list of docs.
* Tue Apr 6 2004 Dams <anvil[AT]livna.org> 0:0.9.2-0.lvn.2
- BuildConflicts libraw1394 0.10.0 to prevent surprises.
* Tue Apr 6 2004 Dams <anvil[AT]livna.org> 0:0.9.2-0.lvn.1
- Conditionnal firewire stuff rewriten
* Wed Mar 10 2004 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.1
- Updated to final 0.9.2 release
- firewire now default enabled
* Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.7.pre1
- Removed comment after scriptlets
* Sat Aug 16 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.6.pre1
- Without firewire BuildConflicts with libdv/libavc1394/libraw1394-devel
* Mon Jul 14 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.5.pre1
- Added missing deps for ffmpeg-devel
- Added build option "with firewire" (disabled by default)
* Wed Jul 9 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.4.pre1
- Added missing unowned directory
- Removed URL in Source0
- buildroot -> RPM_BUILD_ROOT
- athlon is mmx compliant too
- Now include all *.so/*.so.*/.a in libdir (bug #451)
* Wed Apr 23 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.3.pre1
- Typo in group tag
* Mon Apr 21 2003 Dams <anvil[AT]livna.org> 0:0.9.2-0.fdr.0.2.pre1
- Major fix from from Diag (plugins are now in the package).
* Wed Apr 16 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:53:08 -0000 1.1
+++ .cvsignore 8 Aug 2008 18:13:13 -0000 1.2
@@ -0,0 +1 @@
+libquicktime-1.0.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:53:08 -0000 1.1
+++ sources 8 Aug 2008 18:13:13 -0000 1.2
@@ -0,0 +1 @@
+823191104cdd665c75d447c8f5f8bf7e libquicktime-1.0.3.tar.gz
16 years, 2 months
- 1
- 0
rpms/sdlmame/F-8 .cvsignore, 1.8, 1.9 sdlmame.spec, 1.9, 1.10 sources, 1.8, 1.9
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12159
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Thu Aug 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0127-0.4.0126u4
- Updated to 0.126u4
- Added ldverify, dropped makemeta
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-8/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 31 Jul 2008 17:21:03 -0000 1.8
+++ .cvsignore 7 Aug 2008 22:14:47 -0000 1.9
@@ -1 +1 @@
-sdlmame0126u3.zip
+sdlmame0126u4.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-8/sdlmame.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sdlmame.spec 31 Jul 2008 17:21:03 -0000 1.9
+++ sdlmame.spec 7 Aug 2008 22:14:47 -0000 1.10
@@ -1,4 +1,4 @@
-%define beta 0126u3
+%define beta 0126u4
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0127
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -147,7 +147,7 @@
# install binaries and config files
install -pm 644 mame.ini $RPM_BUILD_ROOT%{_sysconfdir}/mame
install -pm 644 keymaps/* $RPM_BUILD_ROOT%{_datadir}/mame/keymaps
-install -pm 755 chdman jedutil makemeta mame mamed regrep romcmp runtest \
+install -pm 755 chdman jedutil ldverify mame mamed regrep romcmp runtest \
src2html srcclean testkeys $RPM_BUILD_ROOT%{_bindir}
@@ -169,7 +169,7 @@
%doc docs/license.txt
%{_bindir}/chdman
%{_bindir}/jedutil
-%{_bindir}/makemeta
+%{_bindir}/ldverify
%{_bindir}/regrep
%{_bindir}/romcmp
%{_bindir}/runtest
@@ -184,6 +184,10 @@
%changelog
+* Thu Aug 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0127-0.4.0126u4
+- Updated to 0.126u4
+- Added ldverify, dropped makemeta
+
* Thu Jul 31 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0127-0.3.0126u3
- Updated to 0.126u3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-8/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 31 Jul 2008 17:21:03 -0000 1.8
+++ sources 7 Aug 2008 22:14:47 -0000 1.9
@@ -1 +1 @@
-766e38958e670c464fa65dabf19e7b64 sdlmame0126u3.zip
+e9ad8c7fdd16a64eb19a783d5b226d1c sdlmame0126u4.zip
16 years, 2 months
- 1
- 0
rpms/sdlmame/devel .cvsignore, 1.8, 1.9 sdlmame.spec, 1.10, 1.11 sources, 1.8, 1.9
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12030
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Thu Aug 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0127-0.4.0126u4
- Updated to 0.126u4
- Added ldverify, dropped makemeta
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 31 Jul 2008 17:18:47 -0000 1.8
+++ .cvsignore 7 Aug 2008 22:13:57 -0000 1.9
@@ -1 +1 @@
-sdlmame0126u3.zip
+sdlmame0126u4.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sdlmame.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sdlmame.spec 31 Jul 2008 17:18:47 -0000 1.10
+++ sdlmame.spec 7 Aug 2008 22:13:57 -0000 1.11
@@ -1,4 +1,4 @@
-%define beta 0126u3
+%define beta 0126u4
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0127
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -147,7 +147,7 @@
# install binaries and config files
install -pm 644 mame.ini $RPM_BUILD_ROOT%{_sysconfdir}/mame
install -pm 644 keymaps/* $RPM_BUILD_ROOT%{_datadir}/mame/keymaps
-install -pm 755 chdman jedutil makemeta mame mamed regrep romcmp runtest \
+install -pm 755 chdman jedutil ldverify mame mamed regrep romcmp runtest \
src2html srcclean testkeys $RPM_BUILD_ROOT%{_bindir}
@@ -169,7 +169,7 @@
%doc docs/license.txt
%{_bindir}/chdman
%{_bindir}/jedutil
-%{_bindir}/makemeta
+%{_bindir}/ldverify
%{_bindir}/regrep
%{_bindir}/romcmp
%{_bindir}/runtest
@@ -184,6 +184,10 @@
%changelog
+* Thu Aug 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0127-0.4.0126u4
+- Updated to 0.126u4
+- Added ldverify, dropped makemeta
+
* Thu Jul 31 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0127-0.3.0126u3
- Updated to 0.126u3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 31 Jul 2008 17:18:47 -0000 1.8
+++ sources 7 Aug 2008 22:13:57 -0000 1.9
@@ -1 +1 @@
-766e38958e670c464fa65dabf19e7b64 sdlmame0126u3.zip
+e9ad8c7fdd16a64eb19a783d5b226d1c sdlmame0126u4.zip
16 years, 2 months
- 1
- 0
rpms/sdlmame/F-9 .cvsignore, 1.8, 1.9 sdlmame.spec, 1.9, 1.10 sources, 1.8, 1.9
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11620
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Thu Aug 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0127-0.4.0126u4
- Updated to 0.126u4
- Added ldverify, dropped makemeta
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 31 Jul 2008 17:16:38 -0000 1.8
+++ .cvsignore 7 Aug 2008 22:10:24 -0000 1.9
@@ -1 +1 @@
-sdlmame0126u3.zip
+sdlmame0126u4.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/sdlmame.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sdlmame.spec 31 Jul 2008 17:16:38 -0000 1.9
+++ sdlmame.spec 7 Aug 2008 22:10:24 -0000 1.10
@@ -1,4 +1,4 @@
-%define beta 0126u3
+%define beta 0126u4
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0127
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -147,7 +147,7 @@
# install binaries and config files
install -pm 644 mame.ini $RPM_BUILD_ROOT%{_sysconfdir}/mame
install -pm 644 keymaps/* $RPM_BUILD_ROOT%{_datadir}/mame/keymaps
-install -pm 755 chdman jedutil makemeta mame mamed regrep romcmp runtest \
+install -pm 755 chdman jedutil ldverify mame mamed regrep romcmp runtest \
src2html srcclean testkeys $RPM_BUILD_ROOT%{_bindir}
@@ -169,7 +169,7 @@
%doc docs/license.txt
%{_bindir}/chdman
%{_bindir}/jedutil
-%{_bindir}/makemeta
+%{_bindir}/ldverify
%{_bindir}/regrep
%{_bindir}/romcmp
%{_bindir}/runtest
@@ -184,6 +184,10 @@
%changelog
+* Thu Aug 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0127-0.4.0126u4
+- Updated to 0.126u4
+- Added ldverify, dropped makemeta
+
* Thu Jul 31 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0127-0.3.0126u3
- Updated to 0.126u3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 31 Jul 2008 17:16:38 -0000 1.8
+++ sources 7 Aug 2008 22:10:24 -0000 1.9
@@ -1 +1 @@
-766e38958e670c464fa65dabf19e7b64 sdlmame0126u3.zip
+e9ad8c7fdd16a64eb19a783d5b226d1c sdlmame0126u4.zip
16 years, 2 months
- 1
- 0
rpms/lastfm/F-9 lastfm.spec,1.3,1.4
by Sergio Pascual
Author: sergiopr
Update of /cvs/free/rpms/lastfm/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32388
Modified Files:
lastfm.spec
Log Message:
* Thu Aug 07 2008 Sergio Pascual <sergio.pasra at gmail.com> 1.4.0.56102-4.1
Index: lastfm.spec
===================================================================
RCS file: /cvs/free/rpms/lastfm/F-9/lastfm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lastfm.spec 31 Jul 2008 07:05:32 -0000 1.3
+++ lastfm.spec 7 Aug 2008 18:24:09 -0000 1.4
@@ -2,7 +2,7 @@
Name: lastfm
Version: 1.4.0.56102
-Release: 4%{?dist}
+Release: 4%{?dist}.1
Summary: Last.fm music client
Group: Applications/Multimedia
@@ -52,7 +52,7 @@
%{__cp} -a bin/services %{buildroot}/%{_libdir}/%{name}
%{__cp} -a bin/data/icons/as.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/lastfm.png
-desktop-file-install --vendor="rpmfusion" \
+desktop-file-install --vendor="livna" \
--dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}
%clean
@@ -82,6 +82,10 @@
%{_datadir}/icons/hicolor/32x32/apps/lastfm.png
%changelog
+* Thu Aug 07 2008 Sergio Pascual <sergio.pasra at gmail.com> 1.4.0.56102-4.1
+
+- Reverting vendor to livna (http://lists.rpmfusion.org/pipermail/rpmfusion-deve
+lopers/2008-August/000713.html)
* Thu Jul 31 2008 Sergio Pascual <sergio.pasra at gmail.com> 1.4.0.56102-4
- libgpod-devel bug #446442 not fixed in F-9
16 years, 2 months
- 1
- 0
rpms/lastfm/devel lastfm.spec,1.2,1.3
by Sergio Pascual
Author: sergiopr
Update of /cvs/free/rpms/lastfm/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31855
Modified Files:
lastfm.spec
Log Message:
* Thu Aug 07 2008 Sergio Pascual <sergio.pasra at gmail.com> 1.4.0.56102-4
- Reverting vendor to livna (http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2008-August/000...)
Index: lastfm.spec
===================================================================
RCS file: /cvs/free/rpms/lastfm/devel/lastfm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lastfm.spec 23 Jul 2008 06:43:57 -0000 1.2
+++ lastfm.spec 7 Aug 2008 18:13:51 -0000 1.3
@@ -2,7 +2,7 @@
Name: lastfm
Version: 1.4.0.56102
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Last.fm music client
Group: Applications/Multimedia
@@ -50,7 +50,7 @@
%{__cp} -a bin/services %{buildroot}/%{_libdir}/%{name}
%{__cp} -a bin/data/icons/as.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/lastfm.png
-desktop-file-install --vendor="rpmfusion" \
+desktop-file-install --vendor="livna" \
--dir=%{buildroot}/%{_datadir}/applications %{SOURCE1}
%clean
@@ -80,6 +80,9 @@
%{_datadir}/icons/hicolor/32x32/apps/lastfm.png
%changelog
+* Thu Aug 07 2008 Sergio Pascual <sergio.pasra at gmail.com> 1.4.0.56102-4
+- Reverting vendor to livna (http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2008-August/000...)
+
* Wed Jul 23 2008 Sergio Pascual <sergio.pasra at gmail.com> 1.4.0.56102-3
- Importing into rpmfusion
- Vendor changed to rpmfusion
16 years, 2 months
- 1
- 0
rpms/transcode/devel transcode-1.0.2-lzo2.patch, NONE, 1.1 transcode-1.0.4.external_dv.patch, NONE, 1.1 transcode-1.0.5-ImageMagick.patch, NONE, 1.1 transcode-1.0.5-dvdread.patch, NONE, 1.1 transcode-1.0.5-ffmpeg.patch, NONE, 1.1 transcode-1.0.5-nuv.patch, NONE, 1.1 transcode-pvmbin.patch, NONE, 1.1 transcode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/transcode/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31455
Modified Files:
.cvsignore sources
Added Files:
transcode-1.0.2-lzo2.patch transcode-1.0.4.external_dv.patch
transcode-1.0.5-ImageMagick.patch
transcode-1.0.5-dvdread.patch transcode-1.0.5-ffmpeg.patch
transcode-1.0.5-nuv.patch transcode-pvmbin.patch
transcode.spec
Log Message:
initial import from livna
transcode-1.0.2-lzo2.patch:
--- NEW FILE transcode-1.0.2-lzo2.patch ---
--- transcode-1.0.2/import/import_lzo.c~ 2005-07-04 10:09:33.000000000 +0300
+++ transcode-1.0.2/import/import_lzo.c 2006-07-26 20:50:50.000000000 +0300
@@ -22,10 +22,12 @@
*/
#define MOD_NAME "import_lzo.so"
-#define MOD_VERSION "v0.0.3 (2002-11-26)"
+#define MOD_VERSION "v0.1.0 (2005-10-16)"
#define MOD_CODEC "(video) LZO"
#include "transcode.h"
+#include "magic.h"
+#include "export/tc_lzo.h"
static int verbose_flag = TC_QUIET;
static int capability_flag = TC_CAP_PCM | TC_CAP_YUV | TC_CAP_RGB |
@@ -34,15 +36,14 @@
#define MOD_PRE lzo
#include "import_def.h"
-#include <lzo1x.h>
-#if (LZO_VERSION > 0x1070)
-# include <lzoutil.h>
-#endif
+#include <lzo/lzo1x.h>
+#include <lzo/lzoutil.h>
static avi_t *avifile1=NULL;
static avi_t *avifile2=NULL;
+static uint32_t video_codec;
static int audio_codec;
static int aframe_count=0, vframe_count=0;
@@ -103,6 +104,14 @@
fps = AVI_frame_rate(avifile2);
codec = AVI_video_compressor(avifile2);
+ if (strcmp(codec,"LZO1") == 0) {
+ video_codec = TC_CODEC_LZO1;
+ } else if (strcmp(codec,"LZO2") == 0) {
+ video_codec = TC_CODEC_LZO2;
+ } else {
+ fprintf(stderr, "[%s] Unsupported video codec %s", MOD_NAME, codec);
+ return(TC_IMPORT_ERROR);
+ }
fprintf(stderr, "[%s] codec=%s, fps=%6.3f, width=%d, height=%d\n",
MOD_NAME, codec, fps, width, height);
@@ -142,7 +151,7 @@
{
int key;
-
+ lzo_uint size;
long bytes_read=0;
if(param->flag == TC_VIDEO) {
@@ -160,7 +169,24 @@
return(TC_IMPORT_ERROR);
}
- r = lzo1x_decompress(out, out_len, param->buffer, ¶m->size, wrkmem);
+ if (video_codec == TC_CODEC_LZO1) {
+ r = lzo1x_decompress(out, out_len, param->buffer, &size, wrkmem);
+ } else {
+ tc_lzo_header_t *h = (tc_lzo_header_t *)out;
+ uint8_t *compdata = out + sizeof(*h);
+ int compsize = out_len - sizeof(*h);
+ if (h->magic != video_codec) {
+ fprintf(stderr, "[%s] frame with invalid magic 0x%08X\n", MOD_NAME, h->magic);
+ return (TC_IMPORT_ERROR);
+ }
+ if (h->flags & TC_LZO_NOT_COMPRESSIBLE) {
+ tc_memcpy(param->buffer, compdata, compsize);
+ size = compsize;
+ r = LZO_E_OK;
+ } else {
+ r = lzo1x_decompress(compdata, compsize, param->buffer, &size, wrkmem);
+ }
+ }
if (r == LZO_E_OK) {
if(verbose & TC_DEBUG) printf("decompressed %lu bytes into %lu bytes\n",
@@ -172,6 +198,7 @@
return(TC_IMPORT_ERROR);
}
+ param->size = size;
//transcode v.0.5.0-pre8 addition
if(key) param->attributes |= TC_FRAME_IS_KEYFRAME;
--- transcode-1.0.2/import/decode_lzo.c~ 2005-07-04 10:09:33.000000000 +0300
+++ transcode-1.0.2/import/decode_lzo.c 2006-07-26 20:50:55.000000000 +0300
@@ -27,10 +27,8 @@
#ifdef HAVE_LZO
-#include <lzo1x.h>
-#if (LZO_VERSION > 0x1070)
-# include <lzoutil.h>
-#endif
+#include <lzo/lzo1x.h>
+#include <lzo/lzoutil.h>
#include "export/tc_lzo.h"
@@ -100,8 +98,13 @@
goto decoder_error;
}
-
- r = lzo1x_decompress(inbuf, bytes, out, &out_len, wrkmem);
+ if (h.flags & TC_LZO_NOT_COMPRESSIBLE) {
+ tc_memcpy(out, inbuf, bytes);
+ out_len = bytes;
+ r = LZO_E_OK;
+ } else {
+ r = lzo1x_decompress(inbuf, bytes, out, &out_len, wrkmem);
+ }
if (r == LZO_E_OK) {
if(verbose & TC_DEBUG)
--- transcode-1.0.2/import/extract_lzo.c~ 2005-07-04 10:09:33.000000000 +0300
+++ transcode-1.0.2/import/extract_lzo.c 2006-07-26 20:50:52.000000000 +0300
@@ -27,10 +27,8 @@
#ifdef HAVE_LZO
-#include <lzo1x.h>
-#if (LZO_VERSION > 0x1070)
-# include <lzoutil.h>
-#endif
+#include <lzo/lzo1x.h>
+#include <lzo/lzoutil.h>
#define BUFFER_SIZE SIZE_RGB_FRAME<<1
--- transcode-1.0.2/configure.in~ 2005-10-30 06:57:45.000000000 +0200
+++ transcode-1.0.2/configure.in 2006-07-26 20:51:02.000000000 +0300
@@ -1018,7 +1018,7 @@
dnl
dnl LZO
dnl
-TC_PKG_CHECK(lzo, no, LZO, no, [lzo1x.h], lzo, lzo_version, lzo,
+TC_PKG_CHECK(lzo, no, LZO, no, [lzo/lzo1x.h], lzo2, lzo_version, lzo,
[http://www.oberhumer.com/opensource/lzo/])
TC_PKG_HAVE(lzo, LZO)
--- transcode-1.0.2/export/tc_lzo.h~ 2005-07-04 10:15:57.000000000 +0300
+++ transcode-1.0.2/export/tc_lzo.h 2006-07-26 20:50:58.000000000 +0300
@@ -1,7 +1,6 @@
#ifndef TC_LZO_H
#define TC_LZO_H
-#define TC_LZO_MAGIC 0x4C5A4F32 /* LZO2 */
#define TC_LZO_FORMAT_YV12 1
#define TC_LZO_FORMAT_RGB24 2
@@ -14,6 +13,7 @@
unsigned int flags;
unsigned char method; /* compression method */
unsigned char level; /* compression level */
+ short pad;
} tc_lzo_header_t;
#endif /* TC_LZO_H */
--- transcode-1.0.2/export/export_lzo.c~ 2005-07-04 10:09:31.000000000 +0300
+++ transcode-1.0.2/export/export_lzo.c 2006-07-26 20:51:00.000000000 +0300
@@ -29,20 +29,13 @@
#include "aud_aux.h"
#include "import/magic.h"
-#include <lzo1x.h>
-#if (LZO_VERSION > 0x1070)
-# include <lzoutil.h>
-#endif
+#include <lzo/lzo1x.h>
+#include <lzo/lzoutil.h>
-#define LZO2 1
-#undef LZO2
-
-#ifdef LZO2
#include "tc_lzo.h"
-#endif
#define MOD_NAME "export_lzo.so"
-#define MOD_VERSION "v0.0.6 (2003-07-24)"
+#define MOD_VERSION "v0.1.0 (2005-10-15)"
#define MOD_CODEC "(video) LZO real-time compression | (audio) MPEG/AC3/PCM"
static int verbose_flag=TC_QUIET;
@@ -129,23 +122,14 @@
//force keyframe
force_kf=1;
-#ifdef LZO2
AVI_set_video(vob->avifile_out, vob->ex_v_width, vob->ex_v_height, vob->ex_fps, "LZO2");
-#else
- AVI_set_video(vob->avifile_out, vob->ex_v_width, vob->ex_v_height, vob->ex_fps, "LZO1");
-#endif
if (vob->avi_comment_fd>0)
AVI_set_comment_fd(vob->avifile_out, vob->avi_comment_fd);
if(!info_shown && verbose_flag)
-#ifdef LZO2
fprintf(stderr, "[%s] codec=%s, fps=%6.3f, width=%d, height=%d\n",
MOD_NAME, "LZO2", vob->ex_fps, vob->ex_v_width, vob->ex_v_height);
-#else
- fprintf(stderr, "[%s] codec=%s, fps=%6.3f, width=%d, height=%d\n",
- MOD_NAME, "LZO1", vob->ex_fps, vob->ex_v_width, vob->ex_v_height);
-#endif
info_shown=1;
@@ -183,9 +167,7 @@
int key;
-#ifdef LZO2
tc_lzo_header_t h;
-#endif
if(param->flag == TC_VIDEO) {
@@ -197,7 +179,6 @@
* compress from `in' to `out' with LZO1X-1
*/
-#ifdef LZO2
r = lzo1x_1_compress(param->buffer, param->size, out+sizeof(h), &out_len, wrkmem);
h.magic = TC_CODEC_LZO2;
h.size = out_len;
@@ -205,12 +186,9 @@
h.level = 1;
h.flags = 0;
h.flags |= ((codec==CODEC_RGB)?TC_LZO_FORMAT_RGB24:TC_LZO_FORMAT_YV12);
+ h.pad = 0;
- // XXX
tc_memcpy (out, &h, sizeof(h));
-#else
- r = lzo1x_1_compress(param->buffer, param->size, out, &out_len, wrkmem);
-#endif
if (r == LZO_E_OK) {
if(verbose & TC_DEBUG) printf("compressed %lu bytes into %lu bytes\n",
@@ -225,17 +203,15 @@
/* check for an incompressible block */
if (out_len >= param->size) {
if(verbose & TC_DEBUG) printf("[%s] block contains incompressible data\n", MOD_NAME);
-#ifdef LZO2
h.flags |= TC_LZO_NOT_COMPRESSIBLE;
-#endif
+ tc_memcpy(out+sizeof(h), param->buffer, param->size);
+ out_len = param->size;
}
//0.5.0-pre8:
key = ((param->attributes & TC_FRAME_IS_KEYFRAME) || force_kf) ? 1:0;
-#ifdef LZO2
out_len += sizeof(h);
-#endif
//0.6.2: switch outfile on "C" and -J pv
//0.6.2: enforce auto-split at 2G (or user value) for normal AVI files
transcode-1.0.4.external_dv.patch:
--- NEW FILE transcode-1.0.4.external_dv.patch ---
diff -up transcode-1.0.4/filter/preview/Makefile.am.original transcode-1.0.4/filter/preview/Makefile.am
--- transcode-1.0.4/filter/preview/Makefile.am.original 2007-09-28 22:19:51.000000000 +0300
+++ transcode-1.0.4/filter/preview/Makefile.am 2007-09-28 22:23:12.000000000 +0300
@@ -53,7 +53,6 @@ filter_pv_la_LIBADD = \
EXTRA_DIST = \
display.h \
- dv_types.h \
filter_preview.h \
font_xpm.h \
pv.h
Only in transcode-1.0.4.original/filter/preview: dv_types.h
transcode-1.0.5-ImageMagick.patch:
--- NEW FILE transcode-1.0.5-ImageMagick.patch ---
diff -up transcode-1.0.5/configure.in.orig transcode-1.0.5/configure.in
--- transcode-1.0.5/configure.in.orig 2008-07-05 21:28:03.000000000 +0300
+++ transcode-1.0.5/configure.in 2008-07-05 21:30:32.000000000 +0300
@@ -1235,7 +1235,7 @@ dnl
IMAGEMAGICK_EXTRA_LIBS="$IMAGEMAGICK_EXTRA_LIBS -lz -lm"
dnl MagickWand libraries/headers always (?) are a superset of MagickCore ones.
TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, Wand-config, [magick/api.h],
- Magick, InitializeMagick, Wand, [http://www.imagemagick.org/])
+ MagickWand, InitializeMagick, Wand, [http://www.imagemagick.org/])
TC_PKG_HAVE(imagemagick, IMAGEMAGICK)
if test x"$have_imagemagick" = x"yes" ; then
AC_CHECK_HEADER([wand/magick-wand.h],
transcode-1.0.5-dvdread.patch:
--- NEW FILE transcode-1.0.5-dvdread.patch ---
diff -up transcode-1.0.5/configure.in.libdvdread transcode-1.0.5/configure.in
--- transcode-1.0.5/configure.in.libdvdread 2008-07-05 21:33:59.000000000 +0300
+++ transcode-1.0.5/configure.in 2008-07-05 21:34:00.000000000 +0300
@@ -947,7 +947,7 @@ if test x"$have_libdvdread" = x"yes" ; t
libdvdread_inc="no"
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $libdvdread_ii"
- AC_CHECK_HEADER([dvdread/dvd_reader.h],
+ AC_CHECK_HEADER([libdvdread/dvd_reader.h],
[AC_DEFINE([HAVE_LIBDVDREAD_INC], [1],
[have libdvdread includes in separate path])
libdvdread_inc="yes"])
--- transcode-1.0.5/import/dvd_reader.c.libdvdread 2008-07-05 21:41:22.000000000 +0300
+++ transcode-1.0.5/import/dvd_reader.c 2008-07-05 21:41:37.000000000 +0300
@@ -31,11 +31,11 @@
#ifdef HAVE_LIBDVDREAD
#ifdef HAVE_LIBDVDREAD_INC
-#include <dvdread/dvd_reader.h>
-#include <dvdread/ifo_types.h>
-#include <dvdread/ifo_read.h>
-#include <dvdread/nav_read.h>
-#include <dvdread/nav_print.h>
+#include <libdvdread/dvd_reader.h>
+#include <libdvdread/ifo_types.h>
+#include <libdvdread/ifo_read.h>
+#include <libdvdread/nav_read.h>
+#include <libdvdread/nav_print.h>
#else
#include <dvd_reader.h>
#include <ifo_types.h>
diff -up transcode-1.0.5/import/iodump.c.libdvdread transcode-1.0.5/import/iodump.c
--- transcode-1.0.5/import/iodump.c.libdvdread 2008-07-05 21:43:27.000000000 +0300
+++ transcode-1.0.5/import/iodump.c 2008-07-05 21:43:52.000000000 +0300
@@ -31,7 +31,7 @@
#ifdef HAVE_LIBDVDREAD
#ifdef HAVE_LIBDVDREAD_INC
-#include <dvdread/dvd_reader.h>
+#include <libdvdread/dvd_reader.h>
#else
#include <dvd_reader.h>
#endif
transcode-1.0.5-ffmpeg.patch:
--- NEW FILE transcode-1.0.5-ffmpeg.patch ---
diff -up transcode-1.0.5/acinclude.m4.orig transcode-1.0.5/acinclude.m4
diff -up transcode-1.0.5/configure.in.orig transcode-1.0.5/configure.in
--- transcode-1.0.5/configure.in.orig 2008-07-03 20:02:33.000000000 +0300
+++ transcode-1.0.5/configure.in 2008-07-05 12:14:24.000000000 +0300
@@ -611,14 +611,14 @@ AC_ARG_ENABLE(libavcodec-static,
esac],
[enable_libavcodec_static=no])
LIBAVCODEC_EXTRA_LIBS="$LIBAVCODEC_EXTRA_LIBS $($PKG_CONFIG --libs libavcodec)"
-TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [ffmpeg/avcodec.h],
- avcodec, avcodec_thread_init, FFMpeg, [http://www.ffmpeg.org/])
+TC_PKG_CHECK(libavcodec, required, LIBAVCODEC, no, [ffmpeg/libavcodec/avcodec.h],
+ avcodec, avcodec_thread_init, libavcodec, [http://www.ffmpeg.org/])
if test x"$have_libavcodec" = x"yes" ; then
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $LIBAVCODEC_CFLAGS"
AC_TRY_RUN([
#include <stdio.h>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
int
main()
{
@@ -640,8 +640,8 @@ main()
],
[LIBAVCODEC_VERSION="`./conftest$ac_exeext | sed -ne 's,VER=\(.*\),\1,p'`"
LIBAVCODEC_BUILD="`./conftest$ac_exeext | sed -ne 's,BUILD=\(.*\),\1,p'`"],
- [TC_PKG_ERROR(libavcodec, ffmpeg/avcodec.h, required, libavcodec, [http://www.ffmpeg.org],
- [cannot compile ffmpeg/avcodec.h])],
+ [TC_PKG_ERROR(libavcodec, libavcodec/avcodec.h, required, libavcodec, [http://www.ffmpeg.org],
+ [cannot compile libavcodec/avcodec.h])],
[echo $ac_n "cross compiling; assumed OK... $ac_c"
LIBAVCODEC_VERSION=""
LIBAVCODEC_BUILD=""])
@@ -820,7 +820,7 @@ AM_CONDITIONAL(HAVE_IBP, test x"$have_ib
dnl
dnl libpostproc
dnl
-TC_PKG_CHECK(libpostproc, no, LIBPOSTPROC, no, postprocess.h,
+TC_PKG_CHECK(libpostproc, no, LIBPOSTPROC, no, libpostproc/postprocess.h,
postproc, pp_postprocess, libpostproc, [http://www.ffmpeg.org/])
TC_PKG_HAVE(libpostproc, LIBPOSTPROC)
diff -up transcode-1.0.5/export/export_ffmpeg.c.orig transcode-1.0.5/export/export_ffmpeg.c
--- transcode-1.0.5/export/export_ffmpeg.c.orig 2008-07-03 20:37:46.000000000 +0300
+++ transcode-1.0.5/export/export_ffmpeg.c 2008-07-03 20:38:05.000000000 +0300
@@ -36,7 +36,7 @@
#include "vid_aux.h"
// FIXME
#undef EMULATE_FAST_INT
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#if !defined(INFINITY) && defined(HUGE_VAL)
#define INFINITY HUGE_VAL
diff -up transcode-1.0.5/export/ffmpeg_cfg.h.orig transcode-1.0.5/export/ffmpeg_cfg.h
--- transcode-1.0.5/export/ffmpeg_cfg.h.orig 2008-07-03 20:37:00.000000000 +0300
+++ transcode-1.0.5/export/ffmpeg_cfg.h 2008-07-03 20:37:20.000000000 +0300
@@ -2,7 +2,7 @@
#define __FFMPEG_CFG_H
#include "libioaux/configs.h"
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
//char *lavc_param_vcodec = "mpeg4";
//extern int lavc_param_vbitrate;
diff -up transcode-1.0.5/filter/filter_resample.c.orig transcode-1.0.5/filter/filter_resample.c
--- transcode-1.0.5/filter/filter_resample.c.orig 2008-07-03 20:38:33.000000000 +0300
+++ transcode-1.0.5/filter/filter_resample.c 2008-07-03 20:38:50.000000000 +0300
@@ -30,7 +30,7 @@
#include "filter.h"
#include "optstr.h"
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
static char * resample_buffer = NULL;
static int bytes_per_sample;
diff -up transcode-1.0.5/filter/pp/filter_pp.c.orig transcode-1.0.5/filter/pp/filter_pp.c
--- transcode-1.0.5/filter/pp/filter_pp.c.orig 2008-07-05 12:28:19.000000000 +0300
+++ transcode-1.0.5/filter/pp/filter_pp.c 2008-07-05 12:28:48.000000000 +0300
@@ -35,7 +35,7 @@
#include <ctype.h>
#include <inttypes.h>
-#include "postprocess.h"
+#include "libpostproc/postprocess.h"
static pp_mode_t *mode[MAX_FILTER];
static pp_context_t *context[MAX_FILTER];
diff -up transcode-1.0.5/import/decode_lavc.c.orig transcode-1.0.5/import/decode_lavc.c
--- transcode-1.0.5/import/decode_lavc.c.orig 2008-07-03 20:39:16.000000000 +0300
+++ transcode-1.0.5/import/decode_lavc.c 2008-07-03 20:39:44.000000000 +0300
@@ -31,7 +31,7 @@
#ifdef EMULATE_FAST_INT
#undef EMULATE_FAST_INT
#endif
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include "yuv2rgb.h"
#define READ_BUFFER_SIZE (10*1024*1024)
diff -up transcode-1.0.5/import/import_ffmpeg.c.orig transcode-1.0.5/import/import_ffmpeg.c
--- transcode-1.0.5/import/import_ffmpeg.c.orig 2008-07-03 20:40:05.000000000 +0300
+++ transcode-1.0.5/import/import_ffmpeg.c 2008-07-03 20:40:25.000000000 +0300
@@ -38,7 +38,7 @@ static int capability_flag = TC_CAP_YUV
// FIXME
#undef EMULATE_FAST_INT
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include "libvo/yuv2rgb.h"
#include "avilib/avilib.h"
diff -up transcode-1.0.5/src/transcode.c.orig transcode-1.0.5/src/transcode.c
--- transcode-1.0.5/src/transcode.c.orig 2008-01-05 16:37:15.000000000 +0200
+++ transcode-1.0.5/src/transcode.c 2008-07-03 20:41:27.000000000 +0300
@@ -4609,7 +4609,7 @@ int main(int argc, char *argv[]) {
// unneeded object files from a .a file.
#if 0
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
void dummy_avcodec(void) {
AVCodecContext *ctx = NULL;
diff -up transcode-1.0.5/export/aud_aux.c.orig transcode-1.0.5/export/aud_aux.c
--- transcode-1.0.5/export/aud_aux.c.orig 2008-07-05 23:14:48.000000000 +0300
+++ transcode-1.0.5/export/aud_aux.c 2008-07-05 23:15:33.000000000 +0300
@@ -31,7 +31,7 @@
#include <inttypes.h>
#include <assert.h>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include "aud_aux.h"
#include "ac3.h"
transcode-1.0.5-nuv.patch:
--- NEW FILE transcode-1.0.5-nuv.patch ---
diff -up transcode-1.0.5/import/nuv/RTjpegN.c.types transcode-1.0.5/import/nuv/RTjpegN.c
--- transcode-1.0.5/import/nuv/RTjpegN.c.types 2004-10-18 02:01:08.000000000 +0300
+++ transcode-1.0.5/import/nuv/RTjpegN.c 2008-01-13 19:21:45.000000000 +0200
@@ -51,7 +51,7 @@ static const unsigned char RTjpeg_ZZ[64]
62, 55,
63 };
-static const __u64 RTjpeg_aan_tab[64]={
+static const uint64_t RTjpeg_aan_tab[64]={
4294967296ULL, 5957222912ULL, 5611718144ULL, 5050464768ULL, 4294967296ULL, 3374581504ULL, 2324432128ULL, 1184891264ULL,
5957222912ULL, 8263040512ULL, 7783580160ULL, 7005009920ULL, 5957222912ULL, 4680582144ULL, 3224107520ULL, 1643641088ULL,
5611718144ULL, 7783580160ULL, 7331904512ULL, 6598688768ULL, 5611718144ULL, 4408998912ULL, 3036936960ULL, 1548224000ULL,
@@ -63,16 +63,16 @@ static const __u64 RTjpeg_aan_tab[64]={
};
#ifndef MMX
-static __s32 RTjpeg_ws[64+31];
+static int32_t RTjpeg_ws[64+31];
#endif
-__u8 RTjpeg_alldata[2*64+4*64+4*64+4*64+4*64+32];
+uint8_t RTjpeg_alldata[2*64+4*64+4*64+4*64+4*64+32];
-__s16 *block; // rh
-__s16 *RTjpeg_block;
-__s32 *RTjpeg_lqt;
-__s32 *RTjpeg_cqt;
-__u32 *RTjpeg_liqt;
-__u32 *RTjpeg_ciqt;
+int16_t *block; // rh
+int16_t *RTjpeg_block;
+int32_t *RTjpeg_lqt;
+int32_t *RTjpeg_cqt;
+uint32_t *RTjpeg_liqt;
+uint32_t *RTjpeg_ciqt;
unsigned char RTjpeg_lb8;
unsigned char RTjpeg_cb8;
@@ -80,14 +80,14 @@ int RTjpeg_width, RTjpeg_height;
int RTjpeg_Ywidth, RTjpeg_Cwidth;
int RTjpeg_Ysize, RTjpeg_Csize;
-__s16 *RTjpeg_old=NULL;
+int16_t *RTjpeg_old=NULL;
#ifdef MMX
mmx_t RTjpeg_lmask;
mmx_t RTjpeg_cmask;
#else
-__u16 RTjpeg_lmask;
-__u16 RTjpeg_cmask;
+uint16_t RTjpeg_lmask;
+uint16_t RTjpeg_cmask;
#endif
int RTjpeg_mtest=0;
@@ -130,10 +130,10 @@ static const unsigned char RTjpeg_chrom_
/* Block to Stream (encoding) */
/* */
-int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
+int RTjpeg_b2s(int16_t *data, int8_t *strm, uint8_t bt8)
{
register int ci, co=1;
- register __s16 ZZvalue;
+ register int16_t ZZvalue;
register unsigned char bitten;
register unsigned char bitoff;
@@ -154,7 +154,7 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm,
// first byte allways written
strm[0]=
- (__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
+ (uint8_t)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
ci=63;
@@ -270,11 +270,11 @@ HIRNWEH:
if(ZZvalue>0)
{
- strm[co++]=(__s8)(ZZvalue>127)?127:ZZvalue;
+ strm[co++]=(int8_t)(ZZvalue>127)?127:ZZvalue;
}
else
{
- strm[co++]=(__s8)(ZZvalue<-128)?-128:ZZvalue;
+ strm[co++]=(int8_t)(ZZvalue<-128)?-128:ZZvalue;
}
}
@@ -300,7 +300,7 @@ fprintf(stdout, "\n\n");
/* Stream to Block (decoding) */
/* */
-int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
+int RTjpeg_s2b(int16_t *data, int8_t *strm, uint8_t bt8, uint32_t *qtbl)
{
int ci;
register int co;
@@ -310,7 +310,7 @@ int RTjpeg_s2b(__s16 *data, __s8 *strm,
/* first byte always read */
i=RTjpeg_ZZ[0];
- data[i]=((__u8)strm[0])*qtbl[i];
+ data[i]=((uint8_t)strm[0])*qtbl[i];
/* we start at the behind */
@@ -445,10 +445,10 @@ fprintf(stdout, "\n\n");
#else
-int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
+int RTjpeg_b2s(int16_t *data, int8_t *strm, uint8_t bt8)
{
register int ci, co=1, tmp;
- register __s16 ZZvalue;
+ register int16_t ZZvalue;
#ifdef SHOWBLOCK
@@ -460,7 +460,7 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm,
#endif
- (__u8)strm[0]=(__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
+ (uint8_t)strm[0]=(uint8_t)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
for(ci=1; ci<=bt8; ci++)
{
@@ -468,11 +468,11 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm,
if(ZZvalue>0)
{
- strm[co++]=(__s8)(ZZvalue>127)?127:ZZvalue;
+ strm[co++]=(int8_t)(ZZvalue>127)?127:ZZvalue;
}
else
{
- strm[co++]=(__s8)(ZZvalue<-128)?-128:ZZvalue;
+ strm[co++]=(int8_t)(ZZvalue<-128)?-128:ZZvalue;
}
}
@@ -482,11 +482,11 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm,
if(ZZvalue>0)
{
- strm[co++]=(__s8)(ZZvalue>63)?63:ZZvalue;
+ strm[co++]=(int8_t)(ZZvalue>63)?63:ZZvalue;
}
else if(ZZvalue<0)
{
- strm[co++]=(__s8)(ZZvalue<-64)?-64:ZZvalue;
+ strm[co++]=(int8_t)(ZZvalue<-64)?-64:ZZvalue;
}
else /* compress zeros */
{
@@ -497,20 +497,20 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm,
}
while((ci<64)&&(data[RTjpeg_ZZ[ci]]==0));
- strm[co++]=(__s8)(63+(ci-tmp));
+ strm[co++]=(int8_t)(63+(ci-tmp));
ci--;
}
}
return (int)co;
}
-int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
+int RTjpeg_s2b(int16_t *data, int8_t *strm, uint8_t bt8, uint32_t *qtbl)
{
int ci=1, co=1, tmp;
register int i;
i=RTjpeg_ZZ[0];
- data[i]=((__u8)strm[0])*qtbl[i];
+ data[i]=((uint8_t)strm[0])*qtbl[i];
for(co=1; co<=bt8; co++)
{
@@ -540,19 +540,19 @@ int RTjpeg_s2b(__s16 *data, __s8 *strm,
void RTjpeg_quant_init(void)
{
int i;
- __s16 *qtbl;
+ int16_t *qtbl;
- qtbl=(__s16 *)RTjpeg_lqt;
- for(i=0; i<64; i++)qtbl[i]=(__s16)RTjpeg_lqt[i];
+ qtbl=(int16_t *)RTjpeg_lqt;
+ for(i=0; i<64; i++)qtbl[i]=(int16_t)RTjpeg_lqt[i];
- qtbl=(__s16 *)RTjpeg_cqt;
- for(i=0; i<64; i++)qtbl[i]=(__s16)RTjpeg_cqt[i];
+ qtbl=(int16_t *)RTjpeg_cqt;
+ for(i=0; i<64; i++)qtbl[i]=(int16_t)RTjpeg_cqt[i];
}
static mmx_t RTjpeg_ones=(mmx_t)(long long)0x0001000100010001LL;
static mmx_t RTjpeg_half=(mmx_t)(long long)0x7fff7fff7fff7fffLL;
-void RTjpeg_quant(__s16 *block, __s32 *qtbl)
+void RTjpeg_quant(int16_t *block, int32_t *qtbl)
{
int i;
mmx_t *bl, *ql;
@@ -593,12 +593,12 @@ void RTjpeg_quant_init(void)
{
}
-void RTjpeg_quant(__s16 *block, __s32 *qtbl)
+void RTjpeg_quant(int16_t *block, int32_t *qtbl)
{
int i;
for(i=0; i<64; i++)
- block[i]=(__s16)((block[i]*qtbl[i]+32767)>>16);
+ block[i]=(int16_t)((block[i]*qtbl[i]+32767)>>16);
}
#endif
@@ -614,14 +614,14 @@ static mmx_t RTjpeg_zero =(mmx_t)(long l
#else
-#define FIX_0_382683433 ((__s32) 98) /* FIX(0.382683433) */
-#define FIX_0_541196100 ((__s32) 139) /* FIX(0.541196100) */
-#define FIX_0_707106781 ((__s32) 181) /* FIX(0.707106781) */
-#define FIX_1_306562965 ((__s32) 334) /* FIX(1.306562965) */
-
-#define DESCALE10(x) (__s16)( ((x)+128) >> 8)
-#define DESCALE20(x) (__s16)(((x)+32768) >> 16)
-#define D_MULTIPLY(var,const) ((__s32) ((var) * (const)))
+#define FIX_0_382683433 ((int32_t) 98) /* FIX(0.382683433) */
+#define FIX_0_541196100 ((int32_t) 139) /* FIX(0.541196100) */
+#define FIX_0_707106781 ((int32_t) 181) /* FIX(0.707106781) */
+#define FIX_1_306562965 ((int32_t) 334) /* FIX(1.306562965) */
+
+#define DESCALE10(x) (int16_t)( ((x)+128) >> 8)
+#define DESCALE20(x) (int16_t)(((x)+32768) >> 16)
+#define D_MULTIPLY(var,const) ((int32_t) ((var) * (const)))
#endif
void RTjpeg_dct_init(void)
@@ -630,20 +630,20 @@ void RTjpeg_dct_init(void)
for(i=0; i<64; i++)
{
- RTjpeg_lqt[i]=(((__u64)RTjpeg_lqt[i]<<32)/RTjpeg_aan_tab[i]);
- RTjpeg_cqt[i]=(((__u64)RTjpeg_cqt[i]<<32)/RTjpeg_aan_tab[i]);
+ RTjpeg_lqt[i]=(((uint64_t)RTjpeg_lqt[i]<<32)/RTjpeg_aan_tab[i]);
+ RTjpeg_cqt[i]=(((uint64_t)RTjpeg_cqt[i]<<32)/RTjpeg_aan_tab[i]);
}
}
-void RTjpeg_dctY(__u8 *idata, __s16 *odata, int rskip)
+void RTjpeg_dctY(uint8_t *idata, int16_t *odata, int rskip)
{
#ifndef MMX
- __s32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
- __s32 tmp10, tmp11, tmp12, tmp13;
- __s32 z1, z2, z3, z4, z5, z11, z13;
- __u8 *idataptr;
- __s16 *odataptr;
- __s32 *wsptr;
+ int32_t tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+ int32_t tmp10, tmp11, tmp12, tmp13;
+ int32_t z1, z2, z3, z4, z5, z11, z13;
+ uint8_t *idataptr;
+ int16_t *odataptr;
+ int32_t *wsptr;
int ctr;
idataptr = idata;
@@ -1540,17 +1540,17 @@ void RTjpeg_dctY(__u8 *idata, __s16 *oda
#endif
}
-#define FIX_1_082392200 ((__s32) 277) /* FIX(1.082392200) */
-#define FIX_1_414213562 ((__s32) 362) /* FIX(1.414213562) */
-#define FIX_1_847759065 ((__s32) 473) /* FIX(1.847759065) */
-#define FIX_2_613125930 ((__s32) 669) /* FIX(2.613125930) */
+#define FIX_1_082392200 ((int32_t) 277) /* FIX(1.082392200) */
+#define FIX_1_414213562 ((int32_t) 362) /* FIX(1.414213562) */
+#define FIX_1_847759065 ((int32_t) 473) /* FIX(1.847759065) */
+#define FIX_2_613125930 ((int32_t) 669) /* FIX(2.613125930) */
-#define DESCALE(x) (__s16)( ((x)+4) >> 3)
+#define DESCALE(x) (int16_t)( ((x)+4) >> 3)
/* clip yuv to 16..235 (should be 16..240 for cr/cb but ... */
#define RL(x) ((x)>235) ? 235 : (((x)<16) ? 16 : (x))
-#define MULTIPLY(var,const) (((__s32) ((var) * (const)) + 128)>>8)
+#define MULTIPLY(var,const) (((int32_t) ((var) * (const)) + 128)>>8)
void RTjpeg_idct_init(void)
{
@@ -1558,12 +1558,12 @@ void RTjpeg_idct_init(void)
for(i=0; i<64; i++)
{
- RTjpeg_liqt[i]=((__u64)RTjpeg_liqt[i]*RTjpeg_aan_tab[i])>>32;
- RTjpeg_ciqt[i]=((__u64)RTjpeg_ciqt[i]*RTjpeg_aan_tab[i])>>32;
+ RTjpeg_liqt[i]=((uint64_t)RTjpeg_liqt[i]*RTjpeg_aan_tab[i])>>32;
+ RTjpeg_ciqt[i]=((uint64_t)RTjpeg_ciqt[i]*RTjpeg_aan_tab[i])>>32;
}
}
-void RTjpeg_idct(__u8 *odata, __s16 *data, int rskip)
+void RTjpeg_idct(uint8_t *odata, int16_t *data, int rskip)
{
#ifdef MMX
@@ -2557,15 +2557,15 @@ static mmx_t fix_108n184 = (mmx_t)(long
movq_r2m(mm3, *(dataptr));
#else
- __s32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
- __s32 tmp10, tmp11, tmp12, tmp13;
- __s32 z5, z10, z11, z12, z13;
- __s16 *inptr;
- __s32 *wsptr;
- __u8 *outptr;
+ int32_t tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+ int32_t tmp10, tmp11, tmp12, tmp13;
+ int32_t z5, z10, z11, z12, z13;
+ int16_t *inptr;
+ int32_t *wsptr;
+ uint8_t *outptr;
int ctr;
- __s32 dcval;
- __s32 workspace[64];
+ int32_t dcval;
+ int32_t workspace[64];
inptr = data;
wsptr = workspace;
@@ -2625,14 +2625,14 @@ static mmx_t fix_108n184 = (mmx_t)(long
tmp5 = tmp11 - tmp6;
tmp4 = tmp10 + tmp5;
- wsptr[0] = (__s32) (tmp0 + tmp7);
- wsptr[56] = (__s32) (tmp0 - tmp7);
- wsptr[8] = (__s32) (tmp1 + tmp6);
- wsptr[48] = (__s32) (tmp1 - tmp6);
- wsptr[16] = (__s32) (tmp2 + tmp5);
- wsptr[40] = (__s32) (tmp2 - tmp5);
- wsptr[32] = (__s32) (tmp3 + tmp4);
- wsptr[24] = (__s32) (tmp3 - tmp4);
+ wsptr[0] = (int32_t) (tmp0 + tmp7);
+ wsptr[56] = (int32_t) (tmp0 - tmp7);
+ wsptr[8] = (int32_t) (tmp1 + tmp6);
+ wsptr[48] = (int32_t) (tmp1 - tmp6);
+ wsptr[16] = (int32_t) (tmp2 + tmp5);
+ wsptr[40] = (int32_t) (tmp2 - tmp5);
+ wsptr[32] = (int32_t) (tmp3 + tmp4);
+ wsptr[24] = (int32_t) (tmp3 - tmp4);
inptr++;
wsptr++;
@@ -2709,15 +2709,15 @@ void RTjpeg_init_data(void)
dptr=dptr>>5;
dptr=dptr<<5; /* cache align data */
- RTjpeg_block=(__s16 *)dptr;
- dptr+=sizeof(__s16)*64;
- RTjpeg_lqt=(__s32 *)dptr;
- dptr+=sizeof(__s32)*64;
- RTjpeg_cqt=(__s32 *)dptr;
- dptr+=sizeof(__s32)*64;
- RTjpeg_liqt=(__u32 *)dptr;
- dptr+=sizeof(__u32)*64;
- RTjpeg_ciqt=(__u32 *)dptr;
+ RTjpeg_block=(int16_t *)dptr;
+ dptr+=sizeof(int16_t)*64;
+ RTjpeg_lqt=(int32_t *)dptr;
+ dptr+=sizeof(int32_t)*64;
+ RTjpeg_cqt=(int32_t *)dptr;
+ dptr+=sizeof(int32_t)*64;
+ RTjpeg_liqt=(uint32_t *)dptr;
+ dptr+=sizeof(uint32_t)*64;
+ RTjpeg_ciqt=(uint32_t *)dptr;
}
/*
@@ -2731,18 +2731,18 @@ Input: buf -> pointer to 128 ints for qu
Q -> quality factor (192=best, 32=worst)
*/
-void RTjpeg_init_Q(__u8 Q)
+void RTjpeg_init_Q(uint8_t Q)
{
int i;
- __u64 qual;
+ uint64_t qual;
- qual=(__u64)Q<<(32-7); /* 32 bit FP, 255=2, 0=0 */
+ qual=(uint64_t)Q<<(32-7); /* 32 bit FP, 255=2, 0=0 */
for(i=0; i<64; i++)
{
- RTjpeg_lqt[i]=(__s32)((qual/((__u64)RTjpeg_lum_quant_tbl[i]<<16))>>3);
+ RTjpeg_lqt[i]=(int32_t)((qual/((uint64_t)RTjpeg_lum_quant_tbl[i]<<16))>>3);
if(RTjpeg_lqt[i]==0)RTjpeg_lqt[i]=1;
- RTjpeg_cqt[i]=(__s32)((qual/((__u64)RTjpeg_chrom_quant_tbl[i]<<16))>>3);
+ RTjpeg_cqt[i]=(int32_t)((qual/((uint64_t)RTjpeg_chrom_quant_tbl[i]<<16))>>3);
if(RTjpeg_cqt[i]==0)RTjpeg_cqt[i]=1;
RTjpeg_liqt[i]=(1<<16)/(RTjpeg_lqt[i]<<3);
RTjpeg_ciqt[i]=(1<<16)/(RTjpeg_cqt[i]<<3);
@@ -2776,10 +2776,10 @@ Input: buf -> pointer to 128 ints for qu
*/
-void RTjpeg_init_compress(__u32 *buf, int width, int height, __u8 Q)
+void RTjpeg_init_compress(uint32_t *buf, int width, int height, uint8_t Q)
{
int i;
- __u64 qual;
+ uint64_t qual;
RTjpeg_init_data();
@@ -2790,13 +2790,13 @@ void RTjpeg_init_compress(__u32 *buf, in
RTjpeg_Cwidth = RTjpeg_width>>4;
RTjpeg_Csize= (width>>1) * height;
- qual=(__u64)Q<<(32-7); /* 32 bit FP, 255=2, 0=0 */
+ qual=(uint64_t)Q<<(32-7); /* 32 bit FP, 255=2, 0=0 */
for(i=0; i<64; i++)
{
- RTjpeg_lqt[i]=(__s32)((qual/((__u64)RTjpeg_lum_quant_tbl[i]<<16))>>3);
+ RTjpeg_lqt[i]=(int32_t)((qual/((uint64_t)RTjpeg_lum_quant_tbl[i]<<16))>>3);
if(RTjpeg_lqt[i]==0)RTjpeg_lqt[i]=1;
- RTjpeg_cqt[i]=(__s32)((qual/((__u64)RTjpeg_chrom_quant_tbl[i]<<16))>>3);
+ RTjpeg_cqt[i]=(int32_t)((qual/((uint64_t)RTjpeg_chrom_quant_tbl[i]<<16))>>3);
if(RTjpeg_cqt[i]==0)RTjpeg_cqt[i]=1;
RTjpeg_liqt[i]=(1<<16)/(RTjpeg_lqt[i]<<3);
RTjpeg_ciqt[i]=(1<<16)/(RTjpeg_cqt[i]<<3);
@@ -2820,7 +2820,7 @@ void RTjpeg_init_compress(__u32 *buf, in
buf[64+i]=RTjpeg_ciqt[i];
}
-void RTjpeg_init_decompress(__u32 *buf, int width, int height)
+void RTjpeg_init_decompress(uint32_t *buf, int width, int height)
{
int i;
@@ -2851,12 +2851,12 @@ void RTjpeg_init_decompress(__u32 *buf,
// RTjpeg_color_init();
}
-int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp)
+int RTjpeg_compressYUV420(int8_t *sp, unsigned char *bp)
{
- __s8 * sb;
- register __s8 * bp1 = bp + (RTjpeg_width<<3);
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + (RTjpeg_Csize>>1);
+ int8_t * sb;
+ register int8_t * bp1 = bp + (RTjpeg_width<<3);
+ register int8_t * bp2 = bp + RTjpeg_Ysize;
+ register int8_t * bp3 = bp2 + (RTjpeg_Csize>>1);
register int i, j, k;
#ifdef MMX
@@ -2905,11 +2905,11 @@ int RTjpeg_compressYUV420(__s8 *sp, unsi
return (sp-sb);
}
-int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp)
+int RTjpeg_compressYUV422(int8_t *sp, unsigned char *bp)
{
- __s8 * sb;
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + RTjpeg_Csize;
+ int8_t * sb;
+ register int8_t * bp2 = bp + RTjpeg_Ysize;
+ register int8_t * bp3 = bp2 + RTjpeg_Csize;
register int i, j, k;
#ifdef MMX
@@ -2949,9 +2949,9 @@ int RTjpeg_compressYUV422(__s8 *sp, unsi
return (sp-sb);
}
-int RTjpeg_compress8(__s8 *sp, unsigned char *bp)
+int RTjpeg_compress8(int8_t *sp, unsigned char *bp)
{
- __s8 * sb;
+ int8_t * sb;
int i, j;
#ifdef MMX
@@ -2977,10 +2977,10 @@ int RTjpeg_compress8(__s8 *sp, unsigned
return (sp-sb);
}
-void RTjpeg_decompressYUV422(__s8 *sp, __u8 *bp)
+void RTjpeg_decompressYUV422(int8_t *sp, uint8_t *bp)
{
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + (RTjpeg_Csize);
+ register int8_t * bp2 = bp + RTjpeg_Ysize;
+ register int8_t * bp3 = bp2 + (RTjpeg_Csize);
int i, j,k;
#ifdef MMX
@@ -3025,11 +3025,11 @@ void RTjpeg_decompressYUV422(__s8 *sp, _
#endif
}
-void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp)
+void RTjpeg_decompressYUV420(int8_t *sp, uint8_t *bp)
{
- register __s8 * bp1 = bp + (RTjpeg_width<<3);
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + (RTjpeg_Csize>>1);
+ register int8_t * bp1 = bp + (RTjpeg_width<<3);
+ register int8_t * bp2 = bp + RTjpeg_Ysize;
+ register int8_t * bp3 = bp2 + (RTjpeg_Csize>>1);
int i, j,k;
#ifdef MMX
@@ -3087,7 +3087,7 @@ void RTjpeg_decompressYUV420(__s8 *sp, _
#endif
}
-void RTjpeg_decompress8(__s8 *sp, __u8 *bp)
+void RTjpeg_decompress8(int8_t *sp, uint8_t *bp)
{
int i, j;
@@ -3126,7 +3126,7 @@ void RTjpeg_init_mcompress(void)
tmp=(unsigned long)RTjpeg_old;
tmp+=32;
tmp=tmp>>5;
- RTjpeg_old=(__s16 *)(tmp<<5);
+ RTjpeg_old=(int16_t *)(tmp<<5);
}
if (!RTjpeg_old)
{
@@ -3138,7 +3138,7 @@ void RTjpeg_init_mcompress(void)
#ifdef MMX
-int RTjpeg_bcomp(__s16 *old, mmx_t *mask)
+int RTjpeg_bcomp(int16_t *old, mmx_t *mask)
{
int i;
mmx_t *mold=(mmx_t *)old;
@@ -3176,7 +3176,7 @@ int RTjpeg_bcomp(__s16 *old, mmx_t *mask
if(result.q)
{
// if(!RTjpeg_mtest)
-// for(i=0; i<16; i++)((__u64 *)old)[i]=((__u64 *)RTjpeg_block)[i];
+// for(i=0; i<16; i++)((uint64_t *)old)[i]=((uint64_t *)RTjpeg_block)[i];
return 0;
}
// printf(".");
@@ -3184,7 +3184,7 @@ int RTjpeg_bcomp(__s16 *old, mmx_t *mask
}
#else
-int RTjpeg_bcomp(__s16 *old, __u16 *mask)
+int RTjpeg_bcomp(int16_t *old, uint16_t *mask)
{
int i;
@@ -3192,7 +3192,7 @@ int RTjpeg_bcomp(__s16 *old, __u16 *mask
if(abs(old[i]-RTjpeg_block[i])>*mask)
{
if(!RTjpeg_mtest)
- for(i=0; i<16; i++)((__u64 *)old)[i]=((__u64 *)RTjpeg_block)[i];
+ for(i=0; i<16; i++)((uint64_t *)old)[i]=((uint64_t *)RTjpeg_block)[i];
return 0;
}
return 1;
@@ -3204,19 +3204,19 @@ void RTjpeg_set_test(int i)
RTjpeg_mtest=i;
}
-int RTjpeg_mcompressYUV420(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask)
+int RTjpeg_mcompressYUV420(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask)
{
- __s8 * sb;
-//rh __s16 *block;
- register __s8 * bp1 = bp + (RTjpeg_width<<3);
- register __s8 * bp2 = bp + RTjpeg_Ysize;
- register __s8 * bp3 = bp2 + (RTjpeg_Csize>>1);
+ int8_t * sb;
+//rh int16_t *block;
+ register int8_t * bp1 = bp + (RTjpeg_width<<3);
+ register int8_t * bp2 = bp + RTjpeg_Ysize;
+ register int8_t * bp3 = bp2 + (RTjpeg_Csize>>1);
register int i, j, k;
#ifdef MMX
emms();
- RTjpeg_lmask=(mmx_t)(((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask);
- RTjpeg_cmask=(mmx_t)(((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask);
+ RTjpeg_lmask=(mmx_t)(((uint64_t)lmask<<48)|((uint64_t)lmask<<32)|((uint64_t)lmask<<16)|lmask);
+ RTjpeg_cmask=(mmx_t)(((uint64_t)cmask<<48)|((uint64_t)cmask<<32)|((uint64_t)cmask<<16)|cmask);
#else
RTjpeg_lmask=lmask;
RTjpeg_cmask=cmask;
@@ -3233,7 +3233,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
if(RTjpeg_bcomp(block, &RTjpeg_lmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
block+=64;
@@ -3242,7 +3242,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
if(RTjpeg_bcomp(block, &RTjpeg_lmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
block+=64;
@@ -3251,7 +3251,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
if(RTjpeg_bcomp(block, &RTjpeg_lmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
block+=64;
@@ -3260,7 +3260,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
if(RTjpeg_bcomp(block, &RTjpeg_lmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
block+=64;
@@ -3269,7 +3269,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_cqt);
if(RTjpeg_bcomp(block, &RTjpeg_cmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
block+=64;
@@ -3278,7 +3278,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_cqt);
if(RTjpeg_bcomp(block, &RTjpeg_cmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
block+=64;
@@ -3296,18 +3296,18 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
}
-int RTjpeg_mcompressYUV422(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask)
+int RTjpeg_mcompressYUV422(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask)
{
- __s8 * sb;
- __s16 *block;
- register __s8 * bp2;
- register __s8 * bp3;
+ int8_t * sb;
+ int16_t *block;
+ register int8_t * bp2;
+ register int8_t * bp3;
register int i, j, k;
#ifdef MMX
emms();
- RTjpeg_lmask=(mmx_t)(((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask);
- RTjpeg_cmask=(mmx_t)(((__u64)cmask<<48)|((__u64)cmask<<32)|((__u64)cmask<<16)|cmask);
+ RTjpeg_lmask=(mmx_t)(((uint64_t)lmask<<48)|((uint64_t)lmask<<32)|((uint64_t)lmask<<16)|lmask);
+ RTjpeg_cmask=(mmx_t)(((uint64_t)cmask<<48)|((uint64_t)cmask<<32)|((uint64_t)cmask<<16)|cmask);
#else
RTjpeg_lmask=lmask;
RTjpeg_cmask=cmask;
@@ -3328,7 +3328,7 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
if(RTjpeg_bcomp(block, &RTjpeg_lmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
block+=64;
@@ -3337,7 +3337,7 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
if(RTjpeg_bcomp(block, &RTjpeg_lmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
block+=64;
@@ -3346,7 +3346,7 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_cqt);
if(RTjpeg_bcomp(block, &RTjpeg_cmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
block+=64;
@@ -3355,7 +3355,7 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns
RTjpeg_quant(RTjpeg_block, RTjpeg_cqt);
if(RTjpeg_bcomp(block, &RTjpeg_cmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
}
else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
block+=64;
@@ -3372,15 +3372,15 @@ int RTjpeg_mcompressYUV422(__s8 *sp, uns
return (sp-sb);
}
-int RTjpeg_mcompress8(__s8 *sp, unsigned char *bp, __u16 lmask)
+int RTjpeg_mcompress8(int8_t *sp, unsigned char *bp, uint16_t lmask)
{
- __s8 * sb;
- __s16 *block;
+ int8_t * sb;
+ int16_t *block;
int i, j;
#ifdef MMX
emms();
- RTjpeg_lmask=(mmx_t)(((__u64)lmask<<48)|((__u64)lmask<<32)|((__u64)lmask<<16)|lmask);
+ RTjpeg_lmask=(mmx_t)(((uint64_t)lmask<<48)|((uint64_t)lmask<<32)|((uint64_t)lmask<<16)|lmask);
#else
RTjpeg_lmask=lmask;
#endif
@@ -3397,7 +3397,7 @@ int RTjpeg_mcompress8(__s8 *sp, unsigned
RTjpeg_quant(RTjpeg_block, RTjpeg_lqt);
if(RTjpeg_bcomp(block, &RTjpeg_lmask))
{
- *((__u8 *)sp++)=255;
+ *((uint8_t *)sp++)=255;
// printf("* %d ", sp[-1]);
} else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
block+=64;
@@ -3420,12 +3420,12 @@ void RTjpeg_color_init(void)
#define KcbB 132252
#define Ky 76284
-void RTjpeg_yuv422rgb(__u8 *buf, __u8 *rgb, int stride)
+void RTjpeg_yuv422rgb(uint8_t *buf, uint8_t *rgb, int stride)
{
int tmp;
int i, j;
- __s32 y, crR, crG, cbG, cbB;
- __u8 *bufcr, *bufcb, *bufy, *bufoute;
+ int32_t y, crR, crG, cbG, cbB;
+ uint8_t *bufcr, *bufcb, *bufy, *bufoute;
int yskip;
yskip=RTjpeg_width;
@@ -3468,12 +3468,12 @@ void RTjpeg_yuv422rgb(__u8 *buf, __u8 *r
}
-void RTjpeg_yuv420rgb(__u8 *buf, __u8 *rgb, int stride)
+void RTjpeg_yuv420rgb(uint8_t *buf, uint8_t *rgb, int stride)
{
int tmp;
int i, j;
- __s32 y, crR, crG, cbG, cbB;
- __u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
+ int32_t y, crR, crG, cbG, cbB;
+ uint8_t *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
int oskip, yskip;
if(stride==0)
@@ -3542,12 +3542,12 @@ void RTjpeg_yuv420rgb(__u8 *buf, __u8 *r
}
-void RTjpeg_yuvrgb32(__u8 *buf, __u8 *rgb, int stride)
+void RTjpeg_yuvrgb32(uint8_t *buf, uint8_t *rgb, int stride)
{
int tmp;
int i, j;
- __s32 y, crR, crG, cbG, cbB;
- __u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
+ int32_t y, crR, crG, cbG, cbB;
+ uint8_t *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
int oskip, yskip;
if(stride==0)
@@ -3618,12 +3618,12 @@ void RTjpeg_yuvrgb32(__u8 *buf, __u8 *rg
}
}
-void RTjpeg_yuvrgb24(__u8 *buf, __u8 *rgb, int stride)
+void RTjpeg_yuvrgb24(uint8_t *buf, uint8_t *rgb, int stride)
{
int tmp;
int i, j;
- __s32 y, crR, crG, cbG, cbB;
- __u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
+ int32_t y, crR, crG, cbG, cbB;
+ uint8_t *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
int oskip, yskip;
if(stride==0)
@@ -3691,12 +3691,12 @@ void RTjpeg_yuvrgb24(__u8 *buf, __u8 *rg
}
}
-void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rgb, int stride)
+void RTjpeg_yuvrgb16(uint8_t *buf, uint8_t *rgb, int stride)
{
int tmp;
int i, j;
- __s32 y, crR, crG, cbG, cbB;
- __u8 *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
+ int32_t y, crR, crG, cbG, cbB;
+ uint8_t *bufcr, *bufcb, *bufy, *bufoute, *bufouto;
int oskip, yskip;
unsigned char r, g, b;
@@ -3788,7 +3788,7 @@ void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rg
/* fix stride */
-void RTjpeg_yuvrgb8(__u8 *buf, __u8 *rgb, int stride)
+void RTjpeg_yuvrgb8(uint8_t *buf, uint8_t *rgb, int stride)
{
bcopy(buf, rgb, RTjpeg_width*RTjpeg_height);
}
diff -up transcode-1.0.5/import/nuv/RTjpegN.h.types transcode-1.0.5/import/nuv/RTjpegN.h
--- transcode-1.0.5/import/nuv/RTjpegN.h.types 2003-03-08 15:42:48.000000000 +0200
+++ transcode-1.0.5/import/nuv/RTjpegN.h 2008-01-13 19:26:18.000000000 +0200
@@ -22,37 +22,29 @@
*/
-#ifndef _I386_TYPES_H
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned long __u32;
-typedef unsigned long long __u64;
-typedef signed char __s8;
-typedef signed short __s16;
-typedef signed long __s32;
-#endif
+ #include <stdint.h>
-extern void RTjpeg_init_Q(__u8 Q);
-extern void RTjpeg_init_compress(long unsigned int *buf, int width, int height, __u8 Q);
-extern void RTjpeg_init_decompress(long unsigned int *buf, int width, int height);
-extern int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp);
-extern int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp);
-extern void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp);
-extern void RTjpeg_decompressYUV422(__s8 *sp, __u8 *bp);
-extern int RTjpeg_compress8(__s8 *sp, unsigned char *bp);
-extern void RTjpeg_decompress8(__s8 *sp, __u8 *bp);
+extern void RTjpeg_init_Q(uint8_t Q);
+extern void RTjpeg_init_compress(uint32_t *buf, int width, int height, uint8_t Q);
+extern void RTjpeg_init_decompress(uint32_t *buf, int width, int height);
+extern int RTjpeg_compressYUV420(int8_t *sp, unsigned char *bp);
+extern int RTjpeg_compressYUV422(int8_t *sp, unsigned char *bp);
+extern void RTjpeg_decompressYUV420(int8_t *sp, uint8_t *bp);
+extern void RTjpeg_decompressYUV422(int8_t *sp, uint8_t *bp);
+extern int RTjpeg_compress8(int8_t *sp, unsigned char *bp);
+extern void RTjpeg_decompress8(int8_t *sp, uint8_t *bp);
extern void RTjpeg_init_mcompress(void);
-extern int RTjpeg_mcompressYUV420(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask);
-extern int RTjpeg_mcompressYUV422(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask);
-extern int RTjpeg_mcompress8(__s8 *sp, unsigned char *bp, __u16 lmask);
+extern int RTjpeg_mcompressYUV420(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask);
+extern int RTjpeg_mcompressYUV422(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask);
+extern int RTjpeg_mcompress8(int8_t *sp, unsigned char *bp, uint16_t lmask);
extern void RTjpeg_set_test(int i);
-extern void RTjpeg_yuv420rgb(__u8 *buf, __u8 *rgb, int stride);
-extern void RTjpeg_yuv422rgb(__u8 *buf, __u8 *rgb, int stride);
-extern void RTjpeg_yuvrgb8(__u8 *buf, __u8 *rgb, int stride);
-extern void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rgb, int stride);
-extern void RTjpeg_yuvrgb24(__u8 *buf, __u8 *rgb, int stride);
-extern void RTjpeg_yuvrgb32(__u8 *buf, __u8 *rgb, int stride);
+extern void RTjpeg_yuv420rgb(uint8_t *buf, uint8_t *rgb, int stride);
+extern void RTjpeg_yuv422rgb(uint8_t *buf, uint8_t *rgb, int stride);
+extern void RTjpeg_yuvrgb8(uint8_t *buf, uint8_t *rgb, int stride);
+extern void RTjpeg_yuvrgb16(uint8_t *buf, uint8_t *rgb, int stride);
+extern void RTjpeg_yuvrgb24(uint8_t *buf, uint8_t *rgb, int stride);
+extern void RTjpeg_yuvrgb32(uint8_t *buf, uint8_t *rgb, int stride);
diff -up transcode-1.0.5/import/nuv/rtjpeg_vid_plugin.c.types transcode-1.0.5/import/nuv/rtjpeg_vid_plugin.c
--- transcode-1.0.5/import/nuv/rtjpeg_vid_plugin.c.types 2008-01-13 19:30:54.000000000 +0200
+++ transcode-1.0.5/import/nuv/rtjpeg_vid_plugin.c 2008-01-13 19:31:55.000000000 +0200
@@ -467,9 +467,9 @@ unsigned char *decode_vid_frame(struct r
// rtjpeg decompression
if (compoff) {
- RTjpeg_decompressYUV420((__s8 *)strm, rtjpeg_vid_buf);
+ RTjpeg_decompressYUV420((int8_t *)strm, rtjpeg_vid_buf);
} else {
- RTjpeg_decompressYUV420((__s8 *)buf2, rtjpeg_vid_buf);
+ RTjpeg_decompressYUV420((int8_t *)buf2, rtjpeg_vid_buf);
}
return(rtjpeg_vid_buf);
diff -up transcode-1.0.5/import/nuv/README.rtjpeg.types transcode-1.0.5/import/nuv/README.rtjpeg
--- transcode-1.0.5/import/nuv/README.rtjpeg.types 2003-03-08 15:42:48.000000000 +0200
+++ transcode-1.0.5/import/nuv/README.rtjpeg 2008-01-13 18:59:23.000000000 +0200
@@ -82,7 +82,7 @@ RTjpeg Functions:
=================
(some functions may not yet be implemented for all module types)
-extern void RTjpeg_init_Q(__u8 Q);
+extern void RTjpeg_init_Q(uint8_t Q);
----------------------------------
Change the quality factor for future compressions/decompressions to Q.
Q=255 ==> IJG jpeg 75% (max)
@@ -90,7 +90,7 @@ Q=128 ==> IJG jpeg 50%
Q=32 (min usable)
Q=1 (abstract art)
-extern void RTjpeg_init_compress(__u32 *buf, int width, int height, __u8 Q);
+extern void RTjpeg_init_compress(uint32_t *buf, int width, int height, uint8_t Q);
----------------------------------------------------------------------------
Initialise the compressor.
*buf is a pointer to 128 ints. The de-quantizer values are stored in this
@@ -100,13 +100,13 @@ between versions (although it is probabl
height is the height of the Y component of the image.
Q is the quality factor (see above)
-extern void RTjpeg_init_decompress(__u32 *buf, int width, int height);
+extern void RTjpeg_init_decompress(uint32_t *buf, int width, int height);
----------------------------------------------------------------------
Initialise decompressor (and color convertor).
*buf is a pointer to the 128 ints produced by init_compress.
width and height, as before.
-extern int RTjpeg_compress(__s8 *sp, unsigned char *bp);
+extern int RTjpeg_compress(int8_t *sp, unsigned char *bp);
--------------------------------------------------------
Compress the image.
*sp is a pointer to the output data (for safety, this buffer should be as
@@ -114,7 +114,7 @@ Compress the image.
*bp is a pointer to the input data (YUV420P format).
RETURN: the number of bytes actually used for the output stream.
-extern void RTjpeg_decompress(__s8 *sp, __u8 *bp);
+extern void RTjpeg_decompress(int8_t *sp, uint8_t *bp);
--------------------------------------------------
Decompress the image.
as before (no RETURN).
@@ -123,7 +123,7 @@ extern void RTjpeg_init_mcompress(void);
----------------------------------------
Initialise interframe compression.
-extern int RTjpeg_mcompress(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask);
+extern int RTjpeg_mcompress(int8_t *sp, unsigned char *bp, uint16_t lmask, uint16_t cmask);
-----------------------------------------------------------------------------------
Perform interframe compression.
*sp, *bp as for compress
@@ -141,32 +141,32 @@ copy of the reference image. This is us
test multiple compression factors for compressed block size. Remember to
call mcompress with test mode = 0 BEFORE transmitting an encoded block.)
-extern void RTjpeg_yuvrgb(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuvrgb(uint8_t *buf, uint8_t *rgb);
------------------------------------------------
Convert decompressed YUV420P data to RGB data
*buf pointer to YUV420P data
*rgb pointer to RGB data
-extern void RTjpeg_yuvrgb32(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuvrgb32(uint8_t *buf, uint8_t *rgb);
--------------------------------------------------
convert to RGB32 data (display order)
-extern void RTjpeg_yuvrgb24(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuvrgb24(uint8_t *buf, uint8_t *rgb);
--------------------------------------------------
convert to RGB24 (display order)
-extern void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuvrgb16(uint8_t *buf, uint8_t *rgb);
--------------------------------------------------
convert to RGB 565
-extern void RTjpeg_yuvrgb8(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuvrgb8(uint8_t *buf, uint8_t *rgb);
-------------------------------------------------
convert to grey-scale (grin)
-extern void RTjpeg_double32(__u32 *buf);
-extern void RTjpeg_double24(__u8 *buf);
-extern void RTjpeg_double16(__u16 *buf);
-extern void RTjpeg_double8(__u8 *buf);
+extern void RTjpeg_double32(uint32_t *buf);
+extern void RTjpeg_double24(uint8_t *buf);
+extern void RTjpeg_double16(uint16_t *buf);
+extern void RTjpeg_double8(uint8_t *buf);
--------------------------------------
convert the image pointed to by *buf to double size (size is determined by
with and height from init_decompress).
transcode-pvmbin.patch:
--- NEW FILE transcode-pvmbin.patch ---
--- transcode-1.0.0/pvm3/Makefile.in.pvmbin 2005-07-12 10:40:55.000000000 +0300
+++ transcode-1.0.0/pvm3/Makefile.in 2005-07-21 19:41:14.000000000 +0300
@@ -763,11 +763,6 @@
uninstall-info-am uninstall-pkgLTLIBRARIES
-install-data-local:
- @$(NORMAL_INSTALL)
- if test ! -e $(bindir)/pvmgs; then \
- ln -s $(PVM3_PVMGS) $(bindir)/pvmgs; \
- fi;
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- transcode-1.0.0/pvm3/Makefile.am.pvmbin 2005-07-12 10:25:16.000000000 +0300
+++ transcode-1.0.0/pvm3/Makefile.am 2005-07-21 19:41:35.000000000 +0300
@@ -43,8 +43,3 @@
pvm_version.h \
vob_pack_unpack.h
-install-data-local:
- @$(NORMAL_INSTALL)
- if test ! -e $(bindir)/pvmgs; then \
- ln -s $(PVM3_PVMGS) $(bindir)/pvmgs; \
- fi;
--- NEW FILE transcode.spec ---
# TODO (sometime, maybe):
# - avifile (ick): http://avifile.sourceforge.net/
# - LoRS/IBP: http://loci.cs.utk.edu/
# I bet this _will_ change in the future.
%define pvmdir %{_datadir}/pvm3
Name: transcode
Version: 1.0.5
Release: 4%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.transcoding.org/
Source0: http://fromani.exit1.org/%{name}-%{version}.tar.bz2
Patch0: %{name}-pvmbin.patch
Patch2: %{name}-1.0.2-lzo2.patch
Patch3: transcode-1.0.4.external_dv.patch
Patch6: transcode-1.0.5-nuv.patch
Patch7: transcode-1.0.5-ffmpeg.patch
Patch8: transcode-1.0.5-dvdread.patch
Patch9: transcode-1.0.5-ImageMagick.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libogg-devel
BuildRequires: libvorbis-devel
BuildRequires: libdvdread-devel >= 4.1.3
BuildRequires: a52dec-devel
BuildRequires: libxml2-devel
BuildRequires: libjpeg-devel
BuildRequires: lzo-devel >= 2
BuildRequires: mjpegtools-devel
BuildRequires: libdv-devel
BuildRequires: xvidcore-devel
BuildRequires: libquicktime-devel >= 0.9.8
BuildRequires: lame-devel >= 3.89
BuildRequires: SDL-devel >= 1.1.6
BuildRequires: ffmpeg-devel >= 0.4.9-0.46.20080614
BuildRequires: mpeg2dec-devel >= 0.4.0-0.lvn.3.b
BuildRequires: pvm
BuildRequires: libtheora-devel
BuildRequires: libXv-devel
BuildRequires: libXaw-devel
BuildRequires: libXpm-devel
BuildRequires: freetype-devel
%ifarch %{ix86}
BuildRequires: nasm
%endif
BuildRequires: ImageMagick-devel >= 6.4.0.10
BuildRequires: libmpeg3-devel
# libtool + autotools for patch2, autoreconf
BuildRequires: libtool
Requires: xvidcore
%description
transcode is a text console video-stream processing tool. It supports
elementary video and audio frame transformations. Some example modules
are included to enable import of MPEG-1/2, Digital Video, and other
formats. It also includes export modules for writing to AVI files with
DivX, OpenDivX, XviD, Digital Video or other codecs. Direct DVD
transcoding is also supported. A set of tools is available to extract
and decode the sources into raw video/audio streams for import and to
enable post-processing of AVI files.
%prep
%setup -q
%patch0 -p1 -b .pvmbin
%patch2 -p1 -b .lzo
%patch3 -p1 -b .external_dv
rm filter/preview/dv_types.h
%patch6 -p1 -b .types
%patch7 -p1 -b .ffmpeg
%patch8 -p1 -b .libdvdread
%patch9 -p1 -b .ImageMagick
%build
autoreconf # for patch2, and fixes standard rpaths on lib64 archs
for file in docs/{man/*.1,export_mp2.txt,export_mpeg.txt,filter_dnr.txt} \
AUTHORS ChangeLog README docs/README.vcd ; do
iconv -f iso-8859-1 -t utf-8 $file > $file.utf8 && mv -f $file.utf8 $file
done
%configure \
--disable-dependency-tracking \
--with-x \
--enable-netstream \
--enable-v4l \
--enable-oss \
--enable-libpostproc \
--enable-freetype2 \
--enable-ogg \
--enable-vorbis \
--enable-theora \
--enable-pvm3 \
--with-pvm3-libs=`ls -1d %{pvmdir}/lib/LINUX*` \
--with-pvm3-includes=%{pvmdir}/include \
--enable-libdv \
--enable-libquicktime \
--enable-lzo \
--enable-a52 \
--enable-a52-default-decoder \
--enable-libxml2 \
--enable-mjpegtools \
--enable-sdl \
--enable-imagemagick \
--enable-libmpeg3
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT __documentation
make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_docdir}/transcode/ __documentation
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README* TODO __documentation/*
%{_bindir}/*
%{_libdir}/%{name}
%{_mandir}/man1/*.1*
%changelog
* Thu Aug 07 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0.5-4
- rebuild
* Thu Jul 3 2008 <david(a)juran.se> - 1.0.5-3
- updated for new ffmpeg directory layout
- updated for new libdvdread directory layout
- libMagick split in libMagicCore and libMagicWand
* Thu Jan 10 2008 David Juran <david(a)juran.se> - 1.0.5-1
- Upgrade to 1.0.5
- exchanve nuv patch to the one from HEAD
- drop dep-cleanup patch as it's no longer needed
- drop shared-libmpeg3 patch as it's no longer needed
* Sun Dec 9 2007 David Juran <david(a)juran.se> - 1.0.4-7
- Fix build error in nuv import
* Sun Dec 9 2007 David Juran <david(a)juran.se> - 1.0.4-6
- Rebuild for new libdvdread
* Tue Oct 16 2007 David Juran <david(a)juran.se> - 1.0.4-5
- use shared libmpeg3
- use a52dec default decoder as recommended
- License is GPLv2+
* Mon Oct 8 2007 David Juran <david(a)juran.se> - 1.0.4-4
- enable libmpeg3 for rpmfusion
* Sat Sep 29 2007 David Juran <david(a)juran.se> - 1.0.4-3
- Drop indirect dependencies
* Fri Sep 28 2007 David Juran <david(a)juran.se> - 1.0.4-2
- Get rid of glib dependency
* Mon Sep 24 2007 David Juran <david(a)juran.se> - 1.0.4-1
- updated to 1.0.4
* Fri Jun 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0.3-1
- 1.0.3.
- Convert more docs to UTF-8.
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.0.2-12
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Mon Sep 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-11
- Fix build with recent ffmpeg.
- Don't build with libfame.
- Specfile cleanup.
* Wed Jul 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-10
- Backport upstream changes for lzo2, require it.
- Apply upstream fix for compare filter never returning (#987).
- Avoid standard rpaths on lib64 archs.
* Wed Jul 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-4
- Rebuild for new ImageMagick (#1066).
- Fix some cosmetic rpmlint warnings.
* Sat Apr 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-3
- Rebuild for new ffmpeg.
* Tue Mar 14 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 1.0.2-2
- drop "0.lvn" from release
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Thu Jan 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-0.lvn.2
- 1.0.2, libquicktime detection/build fixed upstream.
- Rebuild against new ffmpeg.
- Drop zero Epochs.
- Adapt to modular X.
* Sat Oct 8 2005 Dams <anvil[AT]livna.org> - 0:1.0.0-0.lvn.4
- Really rebuilding against new mjpegtools
* Mon Sep 26 2005 Thorsten Leemhuis <fedoral[AT]leemhuis.info> - 0:1.0.0-0.lvn.3
- Rebuilt against new mjpegtools
* Tue Aug 30 2005 Dams <anvil[AT]livna.org> - 0:1.0.0-0.lvn.2
- Rebuilt against new mjpegtools
* Thu Jul 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.0-0.lvn.1
- 1.0.0, no more SSE/gcc4 special casing needed, pvmlink patch applied upstream
* Tue Jul 5 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.0-0.lvn.0.4.rc1
- 1.0.0rc1, gcc4 patch no longer needed (but SSE/gcc4 problems persist).
- Add upstream patch to fix PVM linking.
- Clean up obsolete pre-FC2 support.
* Sat Jun 18 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0.0-0.lvn.0.3.beta3
- Add "--without sse" rpmbuild option, needed with gcc4.
* Mon Jun 06 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0.0-0.lvn.0.2.beta3
- Add gcc4.patch from plf-package with a small addition from cvs
* Sun May 1 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0.0-0.lvn.0.1.beta3
- 1.0.0beta3.
- Enable PVM support.
* Sun Feb 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.14-0.lvn.5
- Requires: xvidcore.
* Thu Jan 13 2005 Dams <anvil[AT]livna.org> - 0:0.6.14-0.lvn.4
- buildroot -> RPM_BUILD_ROOT, for consistency
* Sun Jan 02 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:0.6.14-0.lvn.3
- Use --with-mod-path={_libdir}/transcode on x86_64
- use make install DESTDIR=%%{buildroot} instead makeinstall; adjust doc-install
* Thu Dec 23 2004 Dams <anvil[AT]livna.org> - 0:0.6.14-0.lvn.2
- Workaround for bad Magick-config
* Tue Dec 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.14-0.lvn.1
- Update to 0.6.14.
- Build with whatever the compiler supports; CPU features detected at runtime.
- Build with dependency tracking disabled.
* Thu Jul 29 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.12-0.lvn.5
- Remove ffmpeg-devel and libpostproc-devel build deps, transcode uses its
internal ones.
* Tue Jul 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.12-0.lvn.4
- Make xvid4 (XviD 1.0.x) the default xvid export module.
- Convert man pages to UTF-8.
* Sun Jul 18 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.12-0.lvn.3
- Build with theora by default, use "--without theora" to disable.
- BuildRequire libexif-devel to work around yet another missing dependency
in ImageMagick-devel.
- Replace hardcoded i686 BuildArch with i686+ ExclusiveArchs.
- Enable MMX and CMOV (also) when built on ia64 and x86_64.
- Enable SSE by default (only) on ia64 and x86_64; use "--with sse" to
enable it on other archs.
- Rebuild with libfame 0.9.1.
- First cut at building with pvm support (incomplete, disabled).
* Sat May 8 2004 Dams <anvil[AT]livna.org> - 0:0.6.12-0.lvn.2
- Added url in Source0
* Fri Jan 9 2004 Dams <anvil[AT]livna.org> 0:0.6.12-0.lvn.1
- Updated to 0.6.12
* Sun Nov 9 2003 Dams <anvil[AT]livna.org> 0:0.6.11-0.lvn.1
- Updated to 0.6.11
- exclude -> rm
* Mon Sep 29 2003 Dams <anvil[AT]livna.org> 0:0.6.10-0.fdr.2
- BuildArch i686
* Tue Sep 9 2003 Dams <anvil[AT]livna.org> 0:0.6.10-0.fdr.1
- Updated to 0.6.10
- Updated doc files
- Dropped Patch1 and Patch2 (applied upstream)
* Thu Aug 14 2003 Dams <anvil[AT]livna.org> 0:0.6.9-0.fdr.1
- Updated to 0.6.9
* Thu Jul 31 2003 Dams <anvil[AT]livna.org> 0:0.6.8-0.fdr.2
- Applied filter_resample-segfault-fix-0.6.8 patch from upstream
* Tue Jul 8 2003 Dams <anvil[AT]livna.org> 0:0.6.8-0.fdr.1
- Updated to 0.6.8
- Removed glib/gtk+ version in BuildReqs
* Mon Jun 2 2003 Warren Togami <warren(a)togami.com> 0:0.6.7-0.fdr.3
- Remove smp_flags due to build failure
* Sun Jun 1 2003 Dams <anvil[AT]livna.org> 0:0.6.7-0.fdr.2
- Enabled text filter
* Sun Jun 1 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.1
- Updated to 0.6.7
- Updated BuildRequires
* Sun Jun 1 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.3
- Removed URL in Source0
* Thu May 22 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.2
- Changed URL in Source0
* Thu May 22 2003 Dams <anvil[AT]livna.org> 0:0.6.6-0.fdr.1
- Updated to 0.6.6
- Updated doc entry
- Slightly modified ifarch condition for nasm
* Sat May 10 2003 Dams <anvil[AT]livna.org> 0:0.6.4-0.fdr.2
- Re-added ffmpeg-devel BuildRequires
- Added libquicktime-devel libpostproc-devel and nasm BuildRequires
* Sat May 10 2003 Dams <anvil[AT]livna.org> 0:0.6.4-0.fdr.1
- Updated to 0.6.4
- Added missing BuildRequires
- exclude some ".la" files
- buildroot -> RPM_BUILD_ROOT
* Wed Apr 23 2003 Dams <anvil[AT]livna.org>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/transcode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:55:16 -0000 1.1
+++ .cvsignore 7 Aug 2008 18:09:52 -0000 1.2
@@ -0,0 +1 @@
+transcode-1.0.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/transcode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:55:16 -0000 1.1
+++ sources 7 Aug 2008 18:09:52 -0000 1.2
@@ -0,0 +1 @@
+124a6055d304fa2d8577d7380e2bcb0c transcode-1.0.5.tar.bz2
16 years, 2 months
- 1
- 0
rpms/gpac/F-9 gpac-0.4.4-soname.patch, NONE, 1.1 gpac-0.4.5-libxml2.patch, NONE, 1.1 gpac-0.4.5-shared_amr.patch, NONE, 1.1 gpac-0.4.5-shared_sggen.patch, NONE, 1.1 gpac-0.4.5-system_libdir.patch, NONE, 1.1 gpac-0.4.5-system_openjpeg.patch, NONE, 1.1 gpac-0.4.5-timestramps.patch, NONE, 1.1 gpac-20080211cvs-gcc43-gnusource.patch, NONE, 1.1 gpac-20080211cvs-no-osmozilla.patch, NONE, 1.1 gpac-snapshot.sh, NONE, 1.1 gpac.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/gpac/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29448
Modified Files:
.cvsignore sources
Added Files:
gpac-0.4.4-soname.patch gpac-0.4.5-libxml2.patch
gpac-0.4.5-shared_amr.patch gpac-0.4.5-shared_sggen.patch
gpac-0.4.5-system_libdir.patch
gpac-0.4.5-system_openjpeg.patch gpac-0.4.5-timestramps.patch
gpac-20080211cvs-gcc43-gnusource.patch
gpac-20080211cvs-no-osmozilla.patch gpac-snapshot.sh gpac.spec
Log Message:
initial import from livna
gpac-0.4.4-soname.patch:
--- NEW FILE gpac-0.4.4-soname.patch ---
diff -up gpac/src/Makefile.soname gpac/src/Makefile
--- gpac/src/Makefile.soname 2008-02-17 13:56:20.000000000 +0100
+++ gpac/src/Makefile 2008-02-17 13:56:20.000000000 +0100
@@ -159,6 +159,7 @@ ifeq ($(CONFIG_DARWIN),yes)
LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
endif
EXTRALIBS+=$(GPAC_SH_FLAGS)
+LDFLAGS+="-Wl,-soname,libgpac.so.0"
endif
ifeq ($(WANT_PIC),yes)
gpac-0.4.5-libxml2.patch:
--- NEW FILE gpac-0.4.5-libxml2.patch ---
diff -up gpac/applications/generators/SVG/Makefile.libxml2 gpac/applications/generators/SVG/Makefile
--- gpac/applications/generators/SVG/Makefile.libxml2 2008-02-17 19:12:02.000000000 +0100
+++ gpac/applications/generators/SVG/Makefile 2008-02-17 19:12:41.000000000 +0100
@@ -37,7 +37,7 @@ SRCS := $(OBJS:.o=.c)
all: $(PROG)
SVGGen$(EXE): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LFLAGS) $(EXTRALIBS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LIBS) $(EXTRALIBS)
%.o: %.c
diff -up gpac/configure.libxml2 gpac/configure
--- gpac/configure.libxml2 2008-02-17 19:13:07.000000000 +0100
+++ gpac/configure 2008-02-17 20:09:09.000000000 +0100
@@ -59,6 +59,7 @@ has_oss_audio="no"
has_alsa="no"
has_x11="no"
has_x11_shm="no"
+has_libxml2="no"
disable_svg="no"
no_gcc_opt="no"
use_fixed_point="no"
@@ -892,6 +893,15 @@ for opt do
esac
done
+# If svg isn't disabled
+if test "$disable_svg" != "yes"; then
+# Then we check libxm2 presence via pkg-config
+ if pkg-config libxml-2.0 --exists > /dev/null 2>&1 ; then
+ libxml2_cflags=`pkg-config libxml-2.0 --cflags`
+ libxml2_lib_flags=`pkg-config libxml-2.0 --libs`
+ has_libxml2="yes"
+ fi
+fi
#look for X11 shared memory support
cat > $TMPC << EOF
@@ -1256,6 +1266,11 @@ echo "CONFIG_FFMPEG=$has_ffmpeg" >> conf
echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak
echo "CONFIG_ALSA=$has_alsa" >> config.mak
echo "DISABLE_SVG=$disable_svg" >> config.mak
+echo "HAS_LIBXML2=$has_libxml2" >> config.mak
+if test "$has_libxml2" = "yes"; then
+ echo "XML2_CFLAGS=$libxml2_cflags" >> config.mak
+ echo "XML2_LIBS=$libxml2_lib_flags" >> config.mak
+fi
echo "HAS_OPENGL=$has_opengl" >> config.mak
if test "$has_opengl" = "yes" ; then
echo "OGL_LIBS=$LINK3D" >> config.mak
gpac-0.4.5-shared_amr.patch:
--- NEW FILE gpac-0.4.5-shared_amr.patch ---
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-02-17 23:43:55.000000000 +0100
+++ gpac/modules/amr_dec/amr_dec.c 2008-02-17 23:44:20.000000000 +0100
@@ -29,8 +29,8 @@
#include <gpac/modules/service.h>
#include <gpac/constants.h>
-#include "amr_nb/sp_dec.h"
-#include "amr_nb/d_homing.h"
+#include <amrnb/sp_dec.h>
+#include <amrnb/d_homing.h>
/*default size in CU of composition memory for audio*/
diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile
--- gpac/modules/amr_dec/Makefile.amr 2008-02-17 23:39:25.000000000 +0100
+++ gpac/modules/amr_dec/Makefile 2008-02-17 23:43:23.000000000 +0100
@@ -17,30 +17,30 @@ LDFLAGS+=-pg
endif
#common obj
-OBJS=amr_in.o amr_dec.o \
- ./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
- ./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \
- ./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \
- ./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \
- ./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
- ./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
- ./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
- ./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \
- ./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
- ./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
- ./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \
- ./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \
- ./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
- ./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
- ./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
- ./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
- ./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \
- ./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \
- ./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \
- ./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
- ./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
- ./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
- ./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
+OBJS=amr_in.o amr_dec.o
+# ./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
+# ./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \
+# ./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \
+# ./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \
+# ./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
+# ./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
+# ./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
+# ./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \
+# ./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
+# ./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
+# ./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \
+# ./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \
+# ./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
+# ./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
+# ./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
+# ./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
+# ./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \
+# ./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \
+# ./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \
+# ./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
+# ./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
+# ./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
+# ./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
SRCS := $(OBJS:.o=.c)
@@ -55,12 +55,14 @@ OBJSPIC=$(OBJS:.o=.opic)
else
OBJSPIC=$(OBJS)
endif
+AMR_NB_LIBS=-lamrnb
+AMR_WB_LIBS=-lamrwb
all: $(LIB)
$(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
%.o: %.c
diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile
--- gpac/modules/amr_float_dec/Makefile.amr 2008-02-17 23:26:57.000000000 +0100
+++ gpac/modules/amr_float_dec/Makefile 2008-02-17 23:35:00.000000000 +0100
@@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o
#AMR NB obj
CFLAGS+=-DGPAC_HAS_AMR_FT
ifeq ($(CONFIG_AMR_NB_FT), yes)
-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
+#OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
+AMR_NB_LIBS=-lamrnb
endif
#AMR WB obj
CFLAGS+=-DGPAC_HAS_AMR_FT_WB
ifeq ($(CONFIG_AMR_WB_FT), yes)
-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
- ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
- ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o
+#OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
+# ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
+# ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o
+AMR_WB_LIBS=-lamrwb
endif
@@ -51,7 +53,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
%.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 2006-12-13 16:12:05.000000000 +0100
+++ gpac/modules/amr_float_dec/amr_float_dec.c 2008-02-17 23:38:03.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*/
gpac-0.4.5-shared_sggen.patch:
--- NEW FILE gpac-0.4.5-shared_sggen.patch ---
diff -up gpac/applications/generators/SVG/Makefile.shared gpac/applications/generators/SVG/Makefile
--- gpac/applications/generators/SVG/Makefile.shared 2007-01-09 13:43:57.000000000 +0100
+++ gpac/applications/generators/SVG/Makefile 2008-02-17 17:56:49.000000000 +0100
@@ -15,7 +15,7 @@ LDFLAGS+=-pg
endif
#common obj
-OBJS= html.o laser.o main.o v1.o v2.o v3.o ../../../src/utils/list.o ../../../src/utils/error.o
+OBJS= html.o laser.o main.o v1.o v2.o v3.o
CFLAGS+=-g
LDFLAGS+=-g
@@ -24,10 +24,12 @@ CFLAGS+=$(XML2_CFLAGS)
ifeq ($(CONFIG_WIN32),yes)
EXE=.exe
PROG=SVGGen$(EXE)
+OBJS= html.o laser.o main.o v1.o v2.o v3.o ../../../src/utils/list.o ../../../src/utils/error.o
EXTRALIBS+=-lwsock32 -lz
else
EXT=
PROG=SVGGen
+LIBS=-L../../../bin/gcc/ -lgpac
endif
SRCS := $(OBJS:.o=.c)
@@ -35,7 +37,7 @@ SRCS := $(OBJS:.o=.c)
all: $(PROG)
SVGGen$(EXE): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LFLAGS) $(EXTRALIBS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LFLAGS) $(EXTRALIBS)
%.o: %.c
diff -up gpac/applications/generators/X3D/Makefile.shared gpac/applications/generators/X3D/Makefile
--- gpac/applications/generators/X3D/Makefile.shared 2006-05-24 11:52:52.000000000 +0200
+++ gpac/applications/generators/X3D/Makefile 2008-02-17 17:56:09.000000000 +0100
@@ -15,15 +15,16 @@ LDFLAGS+=-pg
endif
#common obj
-OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o
+OBJS= main.o
ifeq ($(CONFIG_WIN32),yes)
EXE=.exe
PROG=X3DGen$(EXE)
+OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o
else
-OBJS+=../../../src/utils/os_divers.o
EXT=
PROG=X3DGen
+LIBS=-L../../../bin/gcc/ -lgpac
endif
SRCS := $(OBJS:.o=.c)
@@ -31,7 +32,7 @@ SRCS := $(OBJS:.o=.c)
all: $(PROG)
$(PROG): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRALIBS)
%.o: %.c
diff -up gpac/applications/generators/MPEG4/Makefile.shared gpac/applications/generators/MPEG4/Makefile
--- gpac/applications/generators/MPEG4/Makefile.shared 2006-05-24 11:52:52.000000000 +0200
+++ gpac/applications/generators/MPEG4/Makefile 2008-02-17 17:55:25.000000000 +0100
@@ -15,15 +15,16 @@ LDFLAGS+=-pg
endif
#common obj
-OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o
+OBJS= main.o
ifeq ($(CONFIG_WIN32),yes)
EXE=.exe
PROG=MPEG4Gen$(EXE)
+OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o
else
-OBJS+=../../../src/utils/os_divers.o
EXT=
PROG=MPEG4Gen
+LIBS=-L../../../bin/gcc/ -lgpac
endif
SRCS := $(OBJS:.o=.c)
@@ -31,7 +32,7 @@ SRCS := $(OBJS:.o=.c)
all: $(PROG)
$(PROG): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRALIBS)
%.o: %.c
gpac-0.4.5-system_libdir.patch:
--- NEW FILE gpac-0.4.5-system_libdir.patch ---
diff -up gpac/Makefile.libdir gpac/Makefile
--- gpac/Makefile.libdir 2007-08-28 14:51:16.000000000 +0200
+++ gpac/Makefile 2008-02-17 14:47:22.000000000 +0100
@@ -63,11 +63,11 @@ ifeq ($(DEBUGBUILD),no)
$(STRIP) bin/gcc/libgpac.$(DYN_LIB_SUFFIX)
endif
ifeq ($(CONFIG_DARWIN),yes)
- install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
- ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
+ install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
+ ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
else
- install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
- ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX)
+ install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
+ ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
ldconfig || true
endif
endif
@@ -98,7 +98,7 @@ install-lib:
mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules"
install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
mkdir -p "$(DESTDIR)$(prefix)/lib"
- install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/lib"
+ install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(libdir)"
uninstall-lib:
rm -rf "$(prefix)/include/gpac/internal"
diff -up gpac/configure.libdir gpac/configure
--- gpac/configure.libdir 2007-10-25 11:39:51.000000000 +0200
+++ gpac/configure 2008-02-17 14:53:30.000000000 +0100
@@ -106,6 +106,7 @@ EOF
echo "GPAC configuration options:"
echo " --help print this message"
echo " --prefix=PREFIX install in PREFIX [$prefix]"
+echo " --libdir=LIBDIR system libs in DIR [$libdir]"
echo " --mandir=DIR man documentation in DIR [PREFIX/man]"
echo ""
echo " --source-path=PATH path of source code [$source_path]"
@@ -167,6 +168,8 @@ for opt do
case "$opt" in
--prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
;;
+ --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
+ ;;
--mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
;;
--source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
@@ -479,7 +482,7 @@ fi
if $cc -o $TMPO $TMPC $LINK3D 2> /dev/null ; then
has_opengl="yes"
-elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then
+elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib -L${libdir} 2> /dev/null ; then
has_opengl="yes"
fi
@@ -895,7 +898,7 @@ cat > $TMPC << EOF
#include <X11/Xlib.h>
int main( void ) { return 0; }
EOF
-if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then
+if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib -L${libdir} 2> /dev/null ; then
has_x11="yes"
#look for X11 shared memory support
@@ -1173,8 +1176,9 @@ fi
fi
echo "prefix=$prefix" >> config.mak
+echo "libdir=$libdir" >> config.mak
echo "DESTDIR=$DESTDIR" >> config.mak
-echo "moddir=$prefix/lib/gpac" >> config.mak
+echo "moddir=$libdir/gpac" >> config.mak
echo "mandir=$mandir" >> config.mak
echo "MAKE=$make" >> config.mak
echo "CC=$cc" >> config.mak
gpac-0.4.5-system_openjpeg.patch:
--- NEW FILE gpac-0.4.5-system_openjpeg.patch ---
diff -up gpac/configure.openjpeg gpac/configure
--- gpac/configure.openjpeg 2008-02-17 15:16:22.000000000 +0100
+++ gpac/configure 2008-02-17 15:16:31.000000000 +0100
@@ -526,17 +526,17 @@ fi
#look for OpenJPEG support
cat > $TMPC << EOF
#include <stdio.h>
-#include <openjpeg.h>
+#include <openjpeg/openjpeg.h>
int main( void ) { return 0; }
EOF
-if $cc -o $TMPO $TMPC -lopenjpeg 2> /dev/null ; then
+if $cc -o $TMPO $TMPC -lopenjpeg -lm -L${libdir} 2> /dev/null ; then
has_openjpeg="system"
elif test "$alt_macosx_dir" != "" ; then
if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib -ljpeg 2> /dev/null ; then
has_openjpeg="system"
fi
-elif $cc -o $TMPO $TMPC -I$local_inc/openjpeg -L$local_lib -lopenjpeg 2> /dev/null ; then
+elif $cc -o $TMPO $TMPC -I$local_inc/openjpeg -L$local_lib -lopenjpeg -lm 2> /dev/null ; then
has_openjpeg="local"
fi
diff -up gpac/modules/img_in/jp2_dec.c.openjpeg gpac/modules/img_in/jp2_dec.c
--- gpac/modules/img_in/jp2_dec.c.openjpeg 2007-09-12 18:47:11.000000000 +0200
+++ gpac/modules/img_in/jp2_dec.c 2008-02-17 15:16:22.000000000 +0100
@@ -26,7 +26,7 @@
#ifdef GPAC_HAS_JP2
-#include <openjpeg.h>
+#include <openjpeg/openjpeg.h>
typedef struct
{
gpac-0.4.5-timestramps.patch:
--- NEW FILE gpac-0.4.5-timestramps.patch ---
diff -up gpac/Makefile.timestramps gpac/Makefile
--- gpac/Makefile.timestramps 2008-02-17 15:34:31.000000000 +0100
+++ gpac/Makefile 2008-02-17 15:36:34.000000000 +0100
@@ -54,8 +54,8 @@ install:
$(MAKE) -C applications install
install -d "$(DESTDIR)$(moddir)"
install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
- rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX)
- rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
+ #rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX)
+ #rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX)
ifeq ($(CONFIG_WIN32),yes)
install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/lib
else
@@ -73,11 +73,11 @@ endif
endif
install -d "$(DESTDIR)$(mandir)"
install -d "$(DESTDIR)$(mandir)/man1"
- install -m 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/
- install -m 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/
- install -m 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/
+ install -pm 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/
+ 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/
uninstall:
$(MAKE) -C applications uninstall
@@ -92,11 +92,11 @@ uninstall:
install-lib:
mkdir -p "$(DESTDIR)$(prefix)/include/gpac"
- install -m 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac"
+ install -pm 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac"
mkdir -p "$(DESTDIR)$(prefix)/include/gpac/internal"
- install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal"
+ install -pm 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal"
mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules"
- install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
+ install -pm 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules"
mkdir -p "$(DESTDIR)$(prefix)/lib"
install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(libdir)"
gpac-20080211cvs-gcc43-gnusource.patch:
--- NEW FILE gpac-20080211cvs-gcc43-gnusource.patch ---
--- Makefile.old 2008-02-11 18:31:29.000000000 -0500
+++ Makefile 2008-02-11 18:15:30.000000000 -0500
@@ -2,7 +2,7 @@
vpath %.c $(SRC_PATH)/src
-CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include
+CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include -D_GNU_SOURCE=1
ifeq ($(DEBUGBUILD), yes)
CFLAGS+=-g
gpac-20080211cvs-no-osmozilla.patch:
--- NEW FILE gpac-20080211cvs-no-osmozilla.patch ---
--- Makefile.old 2008-02-11 18:27:28.000000000 -0500
+++ Makefile 2008-02-11 18:28:13.000000000 -0500
@@ -11,13 +11,13 @@
V4STUDIODIR=
INSTDIRS=mp4client
-ifeq ($(TARGET_ARCH_ARMV4L),yes)
-else
-ifeq ($(CONFIG_LINUX),yes)
-INSTDIRS+=osmozilla
-APPDIRS+=osmozilla
-endif
-endif
+#ifeq ($(TARGET_ARCH_ARMV4L),yes)
+#else
+#ifeq ($(CONFIG_LINUX),yes)
+#INSTDIRS+=osmozilla
+#APPDIRS+=osmozilla
+#endif
+#endif
ifeq ($(USE_WXWIDGETS), yes)
APPDIRS+=osmo4_wx
--- NEW FILE gpac-snapshot.sh ---
#!/bin/bash
set -e
tmp=$(mktemp -d)
trap cleanup EXIT
cleanup() {
set +e
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
}
unset CDPATH
pwd=$(pwd)
cvs=$(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
rm -rf gpac/extra_lib/
tar jcf "$pwd"/gpac-$cvs.tar.bz2 gpac
cd - >/dev/null
--- NEW FILE gpac.spec ---
# Todo: - Patch-in xulrunner support within configure with pkg-config support.
# - Add pkg-config support for libs detection.
# - Add pkg-config support generated form configure for gpac (same as ffmpeg).
# - Make it support swscaler enabled ffmpeg (at least test it - upstream).
# - Debug Osmo4 (don't even work).
# - Submit and import patches upstream.
# - Fix unused-direct-shlib-dependency on libgpac
%define osmo Osmo4
%define cvs 20080217
%define with_amr 0
%define with_mozilla 0
%define with_static 1
%define with_osmo 0
# Mozilla stuff fails. It's completely disabled for now.
%define mozver 3.0
%define geckover 1.9
%define xuldir %{_datadir}/idl/xulrunner-sdk-1.9pre
%define xulbindir %{_libdir}/xulrunner-%{geckover}pre
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.5
Release: 0.4.%{cvs}cvs%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
#Source0: http://downloads.sourceforge.net/gpac/gpac-0.4.4.tar.gz
Source0: http://rpms.kwizart.net/fedora/SOURCES/gpac-%{cvs}.tar.bz2
Source10: %{name}-snapshot.sh
Patch0: gpac-20080211cvs-gcc43-gnusource.patch
Patch1: gpac-20080211cvs-no-osmozilla.patch
Patch2: gpac-0.4.4-soname.patch
Patch3: gpac-0.4.5-system_libdir.patch
Patch4: gpac-0.4.5-system_openjpeg.patch
Patch5: gpac-0.4.5-timestramps.patch
Patch6: gpac-0.4.5-shared_sggen.patch
Patch7: gpac-0.4.5-libxml2.patch
Patch8: gpac-0.4.5-shared_amr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: ImageMagick
BuildRequires: SDL-devel
BuildRequires: librsvg2-devel >= 2.5.0
BuildRequires: libGLU-devel
BuildRequires: freeglut-devel
BuildRequires: freetype-devel >= 2.1.4
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: libxml2-devel
BuildRequires: openssl-devel
BuildRequires: openjpeg-devel
BuildRequires: zlib-devel
BuildRequires: libogg-devel libvorbis-devel libtheora-devel
BuildRequires: libXt-devel
BuildRequires: libXpm-devel
BuildRequires: wxGTK-devel
%if %{with_mozilla}
BuildRequires: gecko-devel >= %{geckoverver}
BuildRequires: js-devel
%endif
BuildRequires: doxygen
BuildRequires: desktop-file-utils
%if %{with_amr}
BuildRequires: amrnb-devel
BuildRequires: amrwb-devel
%endif
%description
GPAC is a multimedia framework based on the MPEG-4 Systems standard developed
from scratch in ANSI C. The original development goal is to provide a clean,
small and flexible alternative to the MPEG-4 Systems reference software.
GPAC features the integration of recent multimedia standards (SVG/SMIL, VRML,
X3D, SWF, 3GPP(2) tools and more) into a single framework. GPAC also features
MPEG-4 Systems encoders/multiplexers, publishing tools for content distribution
for MP4 and 3GPP(2) files and many tools for scene descriptions
(MPEG4 <-> VRML <-> X3D converters, SWF -> MPEG-4, etc).
%package libs
Summary: Library for %{name}
Group: System Environment/Libraries
%description libs
The %{name}-libs package contains library for %{name}.
%package devel
Summary: Development libraries and files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%if %{with_static}
%else
%endif
%description devel
Development libraries and files for gpac.
%if %{with_static}
%package devel-static
Summary: Development libraries and files for %{name}
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description devel-static
Static library for gpac.
%endif
%if %{with_osmo}
%package -n %{osmo}
Summary: Media player based on gpac
Group: Applications/Multimedia
%description -n %{osmo}
Osmo4 is an MPEG-4 player with the following features:
* MPEG-4 Systems player
* Optimized 2D graphics renderer compliant with the Complete2D Scene Graph
and Graphics profiles
* Video and audio presentation achieved through plugins
* Multimedia player features:
* Timeline controls: play, pause, step.
* Graphics features: antialising, zoom and pan, scalable resizing of
rendering area, basic full screen support.
* Support for Advanced Text and Graphics extension of MPEG-4 Systems
under standardization.
* Frame export to JPG, PNG, BMP.
%endif
%if %{with_mozilla}
%package -n mozilla-%{osmo}
Summary: Osmo Media Player plugin for Mozilla compatible web browsers
Group: Applications/Multimedia
Requires: %{osmo} = %{version}-%{release}
#Requires: firefox >= %{mozver}
Requires: %{_libdir}/mozilla
%description -n mozilla-%{osmo}
This package contains the OSMO Media Player plugin for Mozilla compatible
web browsers.
%endif
%prep
%setup -q -n gpac
pushd src
%patch0 -b .patch0
popd
pushd applications
%patch1 -b .patch1
popd
%patch2 -p1 -b .soname
%patch3 -p1 -b .libdir
%patch4 -p1 -b .openjpeg
%patch5 -p1 -b .timestramps
%patch6 -p1 -b .shared
%patch7 -p1 -b .libxml2
%patch8 -p1 -b .amr
## 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
## lib64 compatible - hardcoded with patch3
## kwizart - lib64 compatible - modified
#sed -i -e 's|lGLU|lGLU -L%{_libdir}|g' configure
#sed -i -e 's|$(prefix)/lib/gpac|%{_libdir}/gpac|' configure
#sed -i -e 's|$(prefix)/lib|%{_libdir}|' Makefile
#sed -i -e 's|$(prefix)/include|%{_includedir}|' Makefile
#sed -i -e 's|$(prefix)/lib/$(LIB)|%{_libdir}/$(LIB)|' Makefile
#ifarch x86_64 ia64 ppc64
#sed -i -e 's|is_64="no"|is_64="yes"|' configure
#endif
# Fix openjpeg detection and built - hardcoded with patch4
#sed -i.openjpeg -e 's|openjpeg.h|openjpeg/openjpeg.h|' configure modules/img_in/jp2_dec.c
# Fix compat-wxGTK26 use - seems unneeded but
# sed -i -e 's|wx-config|wx-2.6-config|' configure
# Update doxygen
pushd doc
doxygen -u
popd
# Fix encoding warnings
cp -p Changelog Changelog.origine
iconv -f ISO-8859-1 -t UTF8 Changelog.origine > Changelog
touch -r Changelog.origine Changelog
rm -rf Changelog.origine
cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine > doc/ipmpx_syntax.bt
touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
rm -rf doc/ipmpx_syntax.bt.origine
%build
%configure \
--enable-debug \
--extra-cflags="$RPM_OPT_FLAGS" \
--libdir=%{_libdir} \
--disable-oss-audio \
%if %with_mozilla
--mozdir=%{_libdir}/mozilla/plugins \
%endif
%if %{with_amr}
--enable-amr \
%endif
--disable-static
# --extra-cflags '-fshort-wchar -I/usr/include/xulrunner-sdk-1.9pre/stable -I/usr/include/nspr4' \
# ^ pkg-config libxul --cflags
##
## Osmo-zila plugin.
##
%if %{with_mozilla}
#
# Rebuild osmozilla.xpt
pushd applications/osmozilla
%{xulbindir}/xpidl -m header -I%{xuldir}/stable -I%{xuldir}/unstable nsIOsmozilla.idl
%{xulbindir}/xpidl -m typelib -I%{xuldir}/stable -I%{xuldir}/unstable nsIOsmozilla.idl
%{xulbindir}/xpt_link nposmozilla.xpt nsIOsmozilla.xpt
mv nsIOsmozilla.xpt nsIOsmozilla.xpt_linux
popd
## kwizart - osmozilla parallel make fails
# %{?_smp_mflags}
#make -C applications/osmozilla \
# OPTFLAGS="%optflags -fPIC -I%{_includedir}/nspr4/" \
# INCLUDES="-I%{_datadir}/idl/firefox-%{mozver}/ \
# -I%{_includedir}/firefox-%{mozver}/ \
# -I%{_includedir}/firefox-%{mozver}/xpcom \
# -I%{_includedir}/nspr4/ $INCLUDES" \
# XPIDL_INCL="-I%{_datadir}/idl/firefox-%{mozver}/ \
# -I%{_includedir}/firefox-%{mozver}/ \
# -I%{_includedir}/firefox-%{mozver}/xpcom \
# -I%{_includedir}/nspr4/ $INCLUDES" \
# install
%endif
# Parallele build will fail
make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
#{?_smp_mflags}
make sggen OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
#{?_smp_mflags}
## kwizart - build doxygen doc for devel
pushd doc
doxygen
popd
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install install-lib
%if %{with_mozilla}
## kwizart - Install osmozilla plugin - make instmoz disabled.
mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/{plugins,components}
install -m 755 bin/gcc/nposmozilla.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/nposmozilla.so
install -m 755 bin/gcc/nposmozilla.xpt $RPM_BUILD_ROOT%{_libdir}/mozilla/components/nposmozilla.xpt
%endif
%if %{with_osmo}
# Desktop menu Osmo4
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
cat > %{osmo}.desktop <<EOF
[Desktop Entry]
Name=Osmo4 Media Player
GenericName=Media Player
Comment=MPEG-4 Media Player
Exec=%{osmo}
Terminal=false
Icon=%{osmo}.xpm
Type=Application
Encoding=UTF-8
Categories=Application;AudioVideo;Player;
EOF
desktop-file-install --vendor livna \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--mode 644 \
%{osmo}.desktop
#icons
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m 0644 applications/osmo4_wx/osmo4.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{osmo}.xpm
%else
rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
%endif
## kwizart - rpmlint gpac no-ldconfig-symlink
mv $RPM_BUILD_ROOT%{_libdir}/libgpac-%{version}-DEV.so $RPM_BUILD_ROOT%{_libdir}/libgpac.so.%{version}
ln -sf libgpac.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
ln -sf libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
# Don't provide libgpac.so twice
rm -rf $RPM_BUILD_ROOT%{_libdir}/gpac/libgpac.so
#Install generated sggen binaries
for b in MPEG4 SVG X3D; do
pushd applications/generators/${b}
install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir}
popd
done
%clean
rm -rf $RPM_BUILD_ROOT
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc AUTHORS BUGS Changelog COPYING README TODO
%{_bindir}/MP4*
%{_bindir}/*Gen
%{_datadir}/gpac/
%{_mandir}/man1/*.1.*
%files libs
%defattr(-,root,root)
%{_libdir}/libgpac.so.*
%{_libdir}/gpac/
%if %{with_osmo}
%files -n %{osmo}
%doc AUTHORS BUGS COPYING README TODO
%defattr(-,root,root)
%{_bindir}/Osmo4
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{osmo}.xpm
%endif
%if %{with_mozilla}
%files -n mozilla-%{osmo}
%defattr(-,root,root)
%{_libdir}/mozilla/plugins/nposmozilla.so
%{_libdir}/mozilla/components/nposmozilla.xpt
%endif
%files devel
%doc doc/CODING_STYLE doc/ipmpx_syntax.bt
%doc doc/html/*
%defattr(-,root,root)
%{_includedir}/gpac/
%{_libdir}/libgpac.so
%if %{with_static}
%files devel-static
%defattr(-,root,root)
%{_libdir}/libgpac_static.a
%else
%exclude %{_libdir}/libgpac_static.a
%endif
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.5-0.4.20080217cvs
- rebuild
* Mon Feb 25 2008 kwizart < kwizart at gmail.com > - 0.4.5-0.3.20080217cvs
- Enable devel-static
- Conditionalize Osmo4 (buggy).
- Clean the spec
* Sun Feb 17 2008 kwizart < kwizart at gmail.com > - 0.4.5-0.2.20080217cvs
- Update to 20080217.
- Split libs.
- Use the new amr nosrc scheme (need an end-users rebuilt to add support to it).
- Add openjpeg-devel missing BR
- Static patching instead of dyn patch when possible.
- Disable %%{smp_mflags} (it tries to build the bin before the lib is ready)
- Define soname as libgpac.so.0 (instead of libgpac.so.%%version )
- Exclude static lib
* Mon Feb 11 2008 Stewart Adam < s.adam at diffingo.com > - 0.4.5-0.1.20080211cvs
- Use %%{smp_mflags}
- Oops, we're actually 0.4.5
- Fix gpac so filenames
- Only install nposmozilla when %%{with_firefox} is set
* Mon Feb 11 2008 Stewart Adam < s.adam at diffingo.com > - 0.4.4-3.20080211cvs
- Update to 20080211cvs
- Disable osmozilla, doesn't build with xulrunner
- Fix builds with gcc 4.3
* Sat Dec 15 2007 Stewart Adam < s.adam at diffingo.com > - 0.4.4-2
- Rebuild for rawhide
* Tue Oct 16 2007 Stewart Adam < s.adam at diffingo.com > - 0.4.4-1
- Update to v4.4
* Sat May 26 2007 kwizart < kwizart at gmail.com > - 0.4.3-0.1cvs20070526
- Update to cvs 20070526
- Enable conditional build ( 3gpp firefox )
* Wed Apr 11 2007 kwizart < kwizart at gmail.com > - 0.4.3-0.1cvs20070411
- Update to cvs 20070411
* Thu Dec 08 2006 kwizart < kwizart at gmail.com > - 0.4.3-cvs20061208.1.kwizart.fc6
- Update to 20061208
- Uses firefox-devel (since fc6!)
- Drop tutorial
- Use version-DEV-date with libgpac.so
- Disabled osmozilla
- Fix soname
- Enabled gprof
* Tue Oct 17 2006 kwizart < kwizart at gmail.com > - 0.4.3-cvs20061017.1_FC5
- gpac snapshot.sh
- Revert Patch osmozilla.cpp (v1.17 - build error from gpac/internal/terminal_dev.h)
- TODO: - no-soname make option for libgpac.so
- static lib in devel - needed ?
- osmozilla - xpt link problem.
- Osmo4: segmentation fault on exit.
- MP4Client: segmentation fault on launch.
- The program 'Osmo4' received an X Window System error:
"The error was 'BadMatch (invalid parameter attributes)'.
(Details: serial 37 error_code 8 request_code 42 minor_code 0)"
- MP4Box -version display: GPAC version 0.4.3-DEV (try to display cvs )
* Sat Oct 15 2006 kwizart < kwizart at gmail.com > - 0.4.2-rc2.1_FC5
- Update to 0.4.2cvs20061017
- Use DESTDIR=RPM_BUILD_ROOT in various Makefile.
- Enable mozilla plugin: osmozilla.
- Enable AMR_NB_FLOAT and AMR_WB_FLOAT / bundle AMR_NB_FIXED (but not used by default).
- Provide documentation html in doc .
- Provide tutorial from http://www.wildamerica.com/pages/Marty.html
- Various corrections.
* Fri Sep 01 2006 Anssi Hannula <anssi(a)zarb.org> 0.4.1-0.20060630.2plf2007.0
- lib64 fixes
* Fri Jan 30 2006 Austin Acton <austin(a)mandriva.org> 0.4.1-0.20060630.1plf2007.0
- initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:51:02 -0000 1.1
+++ .cvsignore 7 Aug 2008 17:37:47 -0000 1.2
@@ -0,0 +1 @@
+gpac-20080217.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:51:02 -0000 1.1
+++ sources 7 Aug 2008 17:37:47 -0000 1.2
@@ -0,0 +1 @@
+dd56cf8f1ffe3431813ec3954b93b31d gpac-20080217.tar.bz2
16 years, 2 months
- 1
- 0