rpms/y4mscaler/devel y4mscaler-9.0-new-mjpegtools.patch, NONE, 1.1 y4mscaler.spec, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/y4mscaler/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28763
Modified Files:
y4mscaler.spec
Added Files:
y4mscaler-9.0-new-mjpegtools.patch
Log Message:
* Sat Aug 16 2008 Hans de Goede <jwrdegoede(a)fedoraproject.org> 9.0-7
- Fix build with new mjpegtools
y4mscaler-9.0-new-mjpegtools.patch:
--- NEW FILE y4mscaler-9.0-new-mjpegtools.patch ---
diff -up y4mscaler-9.0/y4mscaler.C~ y4mscaler-9.0/y4mscaler.C
--- y4mscaler-9.0/y4mscaler.C~ 2008-08-16 21:12:06.000000000 +0200
+++ y4mscaler-9.0/y4mscaler.C 2008-08-16 21:13:00.000000000 +0200
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
if (source.read_stream_header(fd_in) != Y4M_OK)
mjpeg_error_exit1("Failed to read YUV4MPEG2 header!");
mjpeg_info("Input Stream Header:");
- source.stream().log_info(LOG_INFO, "<<< ");
+ source.stream().log_info(mjpeg_loglev_t("info"), "<<< ");
/* set target stream defaults from source stream */
target.init_stream(source);
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
/* set up target stream */
target.stream().write_stream_header(fd_out);
mjpeg_info("Output Stream Header:");
- target.stream().log_info(LOG_INFO, ">>> ");
+ target.stream().log_info(mjpeg_loglev_t("info"), ">>> ");
/* do some scaling */
scaling.create_scalers(source, target);
Index: y4mscaler.spec
===================================================================
RCS file: /cvs/free/rpms/y4mscaler/devel/y4mscaler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- y4mscaler.spec 9 Aug 2008 08:52:36 -0000 1.1
+++ y4mscaler.spec 16 Aug 2008 19:07:13 -0000 1.2
@@ -1,12 +1,13 @@
Name: y4mscaler
Version: 9.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Video scaler which operates on YUV4MPEG2 streams
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mir.com/DMG/Software/
Source0: http://www.mir.com/DMG/Software/%{name}-%{version}-src.tgz
+Patch0: y4mscaler-9.0-new-mjpegtools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mjpegtools-devel >= 1.6.3
@@ -20,6 +21,7 @@
%prep
%setup -q
+%patch0 -p1
%build
@@ -44,6 +46,9 @@
%changelog
+* Sat Aug 16 2008 Hans de Goede <jwrdegoede(a)fedoraproject.org> 9.0-7
+- Fix build with new mjpegtools
+
* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 9.0-6
- rebuild
15 years, 8 months
rpms/gstreamer-ffmpeg/F-8 gstreamer-ffmpeg.spec,1.3,1.4
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26855
Modified Files:
gstreamer-ffmpeg.spec
Log Message:
* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.3-7
- Fix build with new ffmpeg
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-8/gstreamer-ffmpeg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gstreamer-ffmpeg.spec 16 Aug 2008 07:29:23 -0000 1.3
+++ gstreamer-ffmpeg.spec 16 Aug 2008 18:43:36 -0000 1.4
@@ -1,6 +1,6 @@
Name: gstreamer-ffmpeg
Version: 0.10.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
# the ffmpeg plugin is LGPL, the postproc plugin is GPL
@@ -65,6 +65,9 @@
%changelog
+* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.3-7
+- Fix build with new ffmpeg
+
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.3-6
- Release bump for rpmfusion build
15 years, 8 months
rpms/gstreamer-plugins-bad/F-8 gstreamer-plugins-bad.spec,1.3,1.4
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25950
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.5-16
- Fix build with new mjpegtools
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/F-8/gstreamer-plugins-bad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gstreamer-plugins-bad.spec 16 Aug 2008 07:28:54 -0000 1.3
+++ gstreamer-plugins-bad.spec 16 Aug 2008 18:29:46 -0000 1.4
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.5
-Release: 15%{?dist}
+Release: 16%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -242,6 +242,9 @@
%changelog
+* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.5-16
+- Fix build with new mjpegtools
+
* Wed Jul 23 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.5-15
- Release bump for rpmfusion
15 years, 8 months
rpms/gstreamer-plugins-bad/F-9 gstreamer-plugins-bad.spec,1.2,1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25753
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.7-4
- Fix build with new mjpegtools
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/F-9/gstreamer-plugins-bad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gstreamer-plugins-bad.spec 16 Aug 2008 06:53:22 -0000 1.2
+++ gstreamer-plugins-bad.spec 16 Aug 2008 18:25:49 -0000 1.3
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.7
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -239,6 +239,9 @@
%changelog
+* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.7-4
+- Fix build with new mjpegtools
+
* Wed Jul 23 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.7-3
- Release bump for rpmfusion
- Merge changes from latest freshrpms package: enable ofa and dirac plugins
15 years, 8 months
rpms/gstreamer-ffmpeg/F-9 gstreamer-ffmpeg.spec,1.5,1.6
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24723
Modified Files:
gstreamer-ffmpeg.spec
Log Message:
* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.4-2.fc9.1
- Fix build with new ffmpeg
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-9/gstreamer-ffmpeg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gstreamer-ffmpeg.spec 15 Aug 2008 17:41:36 -0000 1.5
+++ gstreamer-ffmpeg.spec 16 Aug 2008 18:14:51 -0000 1.6
@@ -1,6 +1,6 @@
Name: gstreamer-ffmpeg
Version: 0.10.4
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
# the ffmpeg plugin is LGPL, the postproc plugin is GPL
@@ -65,6 +65,9 @@
%changelog
+* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.4-2.fc9.1
+- Fix build with new ffmpeg
+
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.4-2
- Release bump for rpmfusion build
15 years, 8 months
rpms/transcode/F-8 transcode.spec,1.5,1.6
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21649
Modified Files:
transcode.spec
Log Message:
Hopefully better libpostproc include path
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/F-8/transcode.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- transcode.spec 12 Aug 2008 17:01:23 -0000 1.5
+++ transcode.spec 16 Aug 2008 17:19:25 -0000 1.6
@@ -7,7 +7,7 @@
Name: transcode
Version: 1.0.4
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -90,7 +90,6 @@
--enable-v4l \
--enable-oss \
--enable-libpostproc \
- --with-libpostproc-includes=%{_includedir}/postproc \
--enable-freetype2 \
--enable-ogg \
--enable-vorbis \
@@ -132,6 +131,9 @@
%changelog
+* Sat Aug 16 2008 David Juran <david(a)juran.se> - 1.0.4-9
+- Hopefully better libpostproc include path
+
* Tue Aug 12 2008 David Juran <david(a)juran.se> - 1.0.4-8
- Back to ffmpeg and apply patch for new structure
15 years, 8 months
rpms/avidemux/devel avidemux-2.4-i18n.patch, NONE, 1.1 avidemux-2.4-libdca.patch, NONE, 1.1 avidemux-2.4.1-qt4.patch, NONE, 1.1 avidemux-2.4.3-lrelease.patch, NONE, 1.1 avidemux.spec, 1.2, 1.3 sources, 1.2, 1.3 avidemux-2.4.2-x264-2pass.patch, 1.1, NONE
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20174
Modified Files:
avidemux.spec sources
Added Files:
avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch
avidemux-2.4.1-qt4.patch avidemux-2.4.3-lrelease.patch
Removed Files:
avidemux-2.4.2-x264-2pass.patch
Log Message:
Update to 2.4.3
avidemux-2.4-i18n.patch:
--- NEW FILE avidemux-2.4-i18n.patch ---
diff -ur avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
--- avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-10-16 21:23:21.000000000 +0300
+++ avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-12-28 20:35:30.000000000 +0200
@@ -53,7 +53,7 @@
{
printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());
- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
+ QString appdir = "/usr/share/avidemux/i18n/";
loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());
diff -ur avidemux_2.4.orig/cmake/Ts.cmake avidemux_2.4/cmake/Ts.cmake
--- avidemux_2.4.orig/cmake/Ts.cmake 2007-10-14 14:58:28.000000000 +0300
+++ avidemux_2.4/cmake/Ts.cmake 2007-12-28 20:36:05.000000000 +0200
@@ -63,7 +63,7 @@
SET(qm_files ${qm_files} ${_outXml} ${_out})
- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
ENDFOREACH(ts_input ${ts_files})
SET(${_sources} ${${_sources}} ${qm_files})
@@ -94,7 +94,7 @@
SET(qm_files ${qm_files} ${_out})
- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
ENDFOREACH(ts_input ${ts_files})
SET(${_sources} ${${_sources}} ${qm_files})
avidemux-2.4-libdca.patch:
--- NEW FILE avidemux-2.4-libdca.patch ---
diff -p -up avidemux_2.4.2/avidemux/CMakeLists.txt.libdca avidemux_2.4.2/avidemux/CMakeLists.txt
--- avidemux_2.4.2/avidemux/CMakeLists.txt.libdca 2008-06-28 15:03:51.000000000 +0200
+++ avidemux_2.4.2/avidemux/CMakeLists.txt 2008-07-24 15:43:18.000000000 +0200
@@ -331,7 +331,7 @@ endif(USE_AMR_NB AND NOT USE_LATE_BINDIN
#libdts
if(USE_LIBDCA AND NOT USE_LATE_BINDING)
- add_libs_all_targets(dts)
+ add_libs_all_targets(dca)
endif(USE_LIBDCA AND NOT USE_LATE_BINDING)
# Lame
diff -p -up avidemux_2.4.2/ConfigureChecks.cmake.libdca avidemux_2.4.2/ConfigureChecks.cmake
--- avidemux_2.4.2/ConfigureChecks.cmake.libdca 2008-07-05 20:24:01.000000000 +0200
+++ avidemux_2.4.2/ConfigureChecks.cmake 2008-07-24 15:43:18.000000000 +0200
@@ -475,7 +475,7 @@ SET(CMAKE_REQUIRED_LIBRARIES "-lm")
IF (USE_LATE_BINDING)
CHECK_INCLUDE_FILES(dts.h USE_LIBDCA)
ELSE (USE_LATE_BINDING)
- ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA)
+ ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA)
ENDIF (USE_LATE_BINDING)
SET(CMAKE_REQUIRED_LIBRARIES)
diff -p -up avidemux_2.4.2/configure.in.in.libdca avidemux_2.4.2/configure.in.in
--- avidemux_2.4.2/configure.in.in.libdca 2008-07-24 15:43:18.000000000 +0200
+++ avidemux_2.4.2/configure.in.in 2008-07-24 15:51:57.000000000 +0200
@@ -891,18 +891,14 @@ have_libdca=no
if test "x$with_libdca" != "xno"; then
have_libdca=yes
AC_CHECK_HEADERS([dts.h], , have_libdca=no)
-
- if test "x$have_libdca" = "xyes"; then
- AC_CHECK_HEADERS([dts_internal.h], , have_libdca=no)
-
+
if test "x$have_libdca" = "xyes"; then
if test "x$use_late_binding" = "xno"; then
- AC_CHECK_LIB(dts, dts_init, , have_libdca=no)
+ AC_CHECK_LIB(dca, dca_init, , have_libdca=no)
fi
else
AC_MSG_WARN(dts.h is there but I also need dts_internal.h to compile libdca/libdts. Please copy dts_internal.h where dts.h is)
fi
- fi
if test "x$have_libdca" = "xyes"; then
AC_DEFINE(USE_LIBDCA, 1, "[libdca detected]")
avidemux-2.4.1-qt4.patch:
--- NEW FILE avidemux-2.4.1-qt4.patch ---
diff -p -up avidemux_2.4.1/configure.in.in~ avidemux_2.4.1/configure.in.in
--- avidemux_2.4.1/configure.in.in~ 2008-02-13 20:04:21.000000000 +0100
+++ avidemux_2.4.1/configure.in.in 2008-02-17 21:43:38.000000000 +0100
@@ -195,7 +195,6 @@ adm_qt4_enabled=yes
echo " ------------------- Probing for QT 4.x ------------------"
QTDIR=xxx
-QTPOSTFIX="-qt4"
QTEXTRAINC="/usr/include/qt4"
QTEXTRALIB="/usr/lib/qt4"
avidemux-2.4.3-lrelease.patch:
--- NEW FILE avidemux-2.4.3-lrelease.patch ---
--- cmake/Ts.cmake.orig 2008-08-16 11:42:53.000000000 -0400
+++ cmake/Ts.cmake 2008-08-16 11:42:59.000000000 -0400
@@ -14,7 +14,7 @@
MACRO(FIND_LRELEASE)
IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND)
- FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS
+ FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
$ENV{QTDIR}/bin)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avidemux.spec 12 Aug 2008 04:19:31 -0000 1.2
+++ avidemux.spec 16 Aug 2008 16:50:48 -0000 1.3
@@ -3,8 +3,8 @@
#define svndate 20080521
Name: avidemux
-Version: 2.4.2
-Release: 3%{?dist}
+Version: 2.4.3
+Release: 1%{?dist}
Summary: Graphical video editing tool
Group: Applications/Multimedia
@@ -14,17 +14,20 @@
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
Patch0: avidemux-2.4.2-pulseaudio-default.patch
+Patch1: avidemux-2.4.1-qt4.patch
+Patch2: avidemux-2.4-i18n.patch
+Patch3: avidemux-2.4-libdca.patch
+Patch4: avidemux-2.4.3-lrelease.patch
#http://bugs.gentoo.org/attachment.cgi?id=160132&action=view
-Patch1: avidemux-2.4.2-x264-2pass.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# GTK interface is what people are used to, let's use that be default.
-Requires: %{name}-gtk
+Requires: %{name}-gui
# Compiling
-BuildRequires: libtool >= 1.5.6
+BuildRequires: cmake
BuildRequires: gettext-devel
-BuildRequires: autoconf
+#BuildRequires: libtool >= 1.5.6
+#BuildRequires: autoconf
# Libraries
BuildRequires: nasm >= 0.98.38
@@ -36,6 +39,8 @@
BuildRequires: libXmu-devel
# Required by gtk: libXi-devel, libXext-devel, libX11-devel
# Required by qt: libXt-devel, libXext-devel, libX11-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: jack-audio-connection-kit-devel
# Sound out
BuildRequires: alsa-lib-devel >= 1.0.3
@@ -49,18 +54,23 @@
BuildRequires: faac-devel >= 1.24
BuildRequires: faad2-devel >= 2.0
BuildRequires: lame-devel >= 3.96.1
-# BuildRequires: libdca-devel
-# needs libdts/dts_internal.h; but that's not shipped by libdca-devel because
-# it's an internal lib. Someone needs to report that upstream to get fixed
BuildRequires: libmad-devel >= 0.15.1
BuildRequires: libogg-devel >= 1.1
BuildRequires: libvorbis-devel >= 1.0.1
+# needs libdts/dts_internal.h; but that's not shipped by libdca-devel because
+# it's an internal lib. Someone needs to report that upstream to get fixed
+# ** this is fixed by patch3
+BuildRequires: libdca-devel
+
+
# Video Codecs
BuildRequires: xvidcore-devel >= 1.0.2
BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
+# FIXME: aften not packaged, add BR when it is
+
# Finally...
BuildRequires: desktop-file-utils
@@ -98,26 +108,14 @@
pushd avidemux
%patch0 -b .pulse
popd
-%patch1 -p1 -b .x264_2pass
+%patch1 -p1 -b .qt4
+%patch2 -p1 -b .i18n
+%patch3 -p1 -b .libdca
+%patch4 -b .lrelease
%build
-make -f Makefile.dist
-# doesn't seem to fix ppc :/
-# edit: maybe it does? let's find out!
-#--with-newfaad \
-%configure \
- --with-jsapi-include=%{_includedir} \
- --with-qt-include=%{_includedir} \
- --with-qt-lib=%{_libdir}/qt4 \
- --with-qt-dir=%{_libdir}/qt4 \
-%ifarch ppc ppc64
- --enable-altivec \
- --with-newfaad \
-%endif
-
-# Weird... %%{?_smp_mflags} works locally, but not on the buildsys?
-make
-
+%cmake
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -145,6 +143,7 @@
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog History README TODO
%{_bindir}/avidemux2_cli
+%{_datadir}/%{name}/
%if %{with_gtk}
%files gtk
@@ -161,6 +160,9 @@
%endif
%changelog
+* Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-1
+- Update to 2.4.3
+
* Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.2-3
- ppc64 uint_32 fun
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 16:47:38 -0000 1.2
+++ sources 16 Aug 2008 16:50:48 -0000 1.3
@@ -1 +1 @@
-6c86fcfa491491b83e1291112fe3a3be avidemux_2.4.2.tar.gz
+ff8e6ac186321e7e8bec9f8177df3724 avidemux_2.4.3.tar.gz
--- avidemux-2.4.2-x264-2pass.patch DELETED ---
15 years, 8 months
rpms/gstreamer-plugins-bad/devel gstreamer-plugins-bad.spec, 1.3, 1.4
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12895
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.8-3
- Enable DVD navigation plugin
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/gstreamer-plugins-bad.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gstreamer-plugins-bad.spec 1 Aug 2008 15:08:37 -0000 1.3
+++ gstreamer-plugins-bad.spec 16 Aug 2008 14:36:04 -0000 1.4
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.8
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -62,6 +62,7 @@
BuildRequires: exempi-devel
BuildRequires: dirac-devel
BuildRequires: libofa-devel
+BuildRequires: libdvdnav-devel
%description
GStreamer is a streaming media framework, based on graphs of elements which
@@ -110,6 +111,8 @@
### we use the system version of libmodplug
%{__rm} -r gst/modplug/libmodplug/*
touch gst/modplug/libmodplug/Makefile.in
+# stupid dvdread includes rename <GRRR>
+sed -i 's|#include <dvdread/|#include <libdvdread/|g' ext/resindvd/resindvdsrc.h
%build
@@ -120,11 +123,9 @@
%configure \
--with-package-name="gst-plugins-bad rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
- --enable-debug \
- --disable-static \
- --enable-gtk-doc \
- --disable-ladspa
-# Don't use rpath!
+ --enable-debug --disable-static --enable-gtk-doc \
+ --disable-ladspa --enable-experimental
+# Don't use rpath!
%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%{__make} %{?_smp_mflags}
@@ -158,6 +159,7 @@
%{_libdir}/gstreamer-%{majorminor}/libgstbayer.so
%{_libdir}/gstreamer-%{majorminor}/libgstcdxaparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace2.so
%{_libdir}/gstreamer-%{majorminor}/libgstdvdspu.so
%{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
%{_libdir}/gstreamer-%{majorminor}/libgstfilter.so
@@ -213,6 +215,7 @@
%{_libdir}/gstreamer-%{majorminor}/libgsttrm.so
%{_libdir}/gstreamer-%{majorminor}/libgstneonhttpsrc.so
%{_libdir}/gstreamer-%{majorminor}/libgstofa.so
+%{_libdir}/gstreamer-%{majorminor}/libresindvd.so
%{_libdir}/gstreamer-%{majorminor}/libgstsdl.so
%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
#%{_libdir}/gstreamer-%{majorminor}/libgstswfdec.so
@@ -237,6 +240,9 @@
%changelog
+* Sat Aug 16 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.8-3
+- Enable DVD navigation plugin
+
* Fri Aug 1 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.8-2
- Release bump to keep rpmfusion version higher then livna
15 years, 8 months
rpms/gstreamer-ffmpeg/F-8 gst-ffmpeg-0.10.1-syslibs.patch, 1.2, 1.3 gstreamer-ffmpeg.spec, 1.2, 1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23058
Modified Files:
gst-ffmpeg-0.10.1-syslibs.patch gstreamer-ffmpeg.spec
Log Message:
* Thu Jul 24 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.3-6
- Release bump for rpmfusion build
gst-ffmpeg-0.10.1-syslibs.patch:
Index: gst-ffmpeg-0.10.1-syslibs.patch
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-8/gst-ffmpeg-0.10.1-syslibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gst-ffmpeg-0.10.1-syslibs.patch 24 Jul 2008 09:17:32 -0000 1.2
+++ gst-ffmpeg-0.10.1-syslibs.patch 16 Aug 2008 07:29:23 -0000 1.3
@@ -28,6 +28,19 @@
case CODEC_ID_MPEG4AAC:
name = "MPEG-2/4 AAC audio";
break;
+@@ -3162,6 +3162,7 @@ gst_ffmpeg_avpicture_fill (AVPicture * p
+ return 0;
+ }
+
++#if 0
+ /**
+ * Convert image 'src' to 'dst'.
+ *
+@@ -3196,3 +3197,4 @@ gst_ffmpeg_img_convert (AVPicture * dst,
+ return img_convert (dst, dst_pix_fmt, src, src_pix_fmt, src_width,
+ src_height);
+ }
++#endif
--- gst-ffmpeg-0.10.2/ext/ffmpeg/gstffmpegcfg.c~ 2007-10-10 15:16:29.000000000 +0200
+++ gst-ffmpeg-0.10.2/ext/ffmpeg/gstffmpegcfg.c 2007-10-10 15:16:29.000000000 +0200
@@ -242,6 +242,7 @@ gst_ffmpeg_pred_method_get_type (void)
@@ -48,3 +61,113 @@
GST_LOG_OBJECT (ffmpegdec, "Opened ffmpeg codec %s, id %d",
oclass->in_plugin->name, oclass->in_plugin->id);
+@@ -1267,11 +1267,7 @@ get_output_buffer (GstFFMpegDec * ffmpeg
+ gst_ffmpeg_avpicture_fill (&pic, GST_BUFFER_DATA (*outbuf),
+ ffmpegdec->context->pix_fmt, width, height);
+
+- /* the original convert function did not do the right thing, this
+- * is a patched up version that adjust widht/height so that the
+- * ffmpeg one works correctly. */
+- gst_ffmpeg_img_convert (&pic, ffmpegdec->context->pix_fmt,
+- (AVPicture *) ffmpegdec->picture,
++ av_picture_copy(&pic, (AVPicture *) ffmpegdec->picture,
+ ffmpegdec->context->pix_fmt, width, height);
+ }
+ return ret;
+diff -up gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.in~ gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.in
+--- gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.in~ 2008-02-10 22:00:45.000000000 +0100
++++ gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.in 2008-02-10 22:00:45.000000000 +0100
+@@ -78,7 +78,7 @@ am_libgstffmpeg_la_OBJECTS = libgstffmpe
+ libgstffmpeg_la-gstffmpegdemux.lo \
+ libgstffmpeg_la-gstffmpegmux.lo \
+ libgstffmpeg_la-gstffmpegdeinterlace.lo \
+- libgstffmpeg_la-gstffmpegscale.lo
++
+ libgstffmpeg_la_OBJECTS = $(am_libgstffmpeg_la_OBJECTS)
+ libgstffmpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgstffmpeg_la_CFLAGS) \
+@@ -271,7 +271,6 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
+ gstffmpegdemux.c \
+ gstffmpegmux.c \
+ gstffmpegdeinterlace.c \
+- gstffmpegscale.c
+
+ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
+ $(FFMPEG_CFLAGS)
+@@ -363,7 +362,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstffmpeg_la-gstffmpegenc.Plo(a)am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstffmpeg_la-gstffmpegmux.Plo(a)am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstffmpeg_la-gstffmpegprotocol.Plo(a)am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstffmpeg_la-gstffmpegscale.Plo(a)am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -449,13 +447,6 @@ libgstffmpeg_la-gstffmpegdeinterlace.lo:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstffmpeg_la_CFLAGS) $(CFLAGS) -c -o libgstffmpeg_la-gstffmpegdeinterlace.lo `test -f 'gstffmpegdeinterlace.c' || echo '$(srcdir)/'`gstffmpegdeinterlace.c
+
+-libgstffmpeg_la-gstffmpegscale.lo: gstffmpegscale.c
+-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstffmpeg_la_CFLAGS) $(CFLAGS) -MT libgstffmpeg_la-gstffmpegscale.lo -MD -MP -MF $(DEPDIR)/libgstffmpeg_la-gstffmpegscale.Tpo -c -o libgstffmpeg_la-gstffmpegscale.lo `test -f 'gstffmpegscale.c' || echo '$(srcdir)/'`gstffmpegscale.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgstffmpeg_la-gstffmpegscale.Tpo $(DEPDIR)/libgstffmpeg_la-gstffmpegscale.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gstffmpegscale.c' object='libgstffmpeg_la-gstffmpegscale.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstffmpeg_la_CFLAGS) $(CFLAGS) -c -o libgstffmpeg_la-gstffmpegscale.lo `test -f 'gstffmpegscale.c' || echo '$(srcdir)/'`gstffmpegscale.c
+-
+ mostlyclean-libtool:
+ -rm -f *.lo
+
+diff -up gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpeg.c~ gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpeg.c
+--- gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpeg.c~ 2008-02-10 21:59:20.000000000 +0100
++++ gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpeg.c 2008-02-10 21:59:20.000000000 +0100
+@@ -143,8 +143,8 @@ plugin_init (GstPlugin * plugin)
+ gst_ffmpegdemux_register (plugin);
+ gst_ffmpegmux_register (plugin);
+ gst_ffmpegdeinterlace_register (plugin);
+- gst_ffmpegscale_register (plugin);
+ #if 0
++ gst_ffmpegscale_register (plugin);
+ gst_ffmpegcsp_register (plugin);
+ #endif
+
+diff -up gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.am~ gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.am
+--- gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.am~ 2008-02-10 22:00:50.000000000 +0100
++++ gst-ffmpeg-0.10.3/ext/ffmpeg/Makefile.am 2008-02-10 22:00:50.000000000 +0100
+@@ -9,7 +9,6 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
+ gstffmpegdemux.c \
+ gstffmpegmux.c \
+ gstffmpegdeinterlace.c \
+- gstffmpegscale.c
+
+ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
+ $(FFMPEG_CFLAGS)
+--- gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegmux.c.syslibs 2006-10-25 19:20:25.000000000 +0200
++++ gst-ffmpeg-0.10.3/ext/ffmpeg/gstffmpegmux.c 2007-01-19 16:57:04.000000000 +0100
+@@ -481,7 +481,7 @@ gst_ffmpegmux_collected (GstCollectPads
+ ffmpegmux->opened = TRUE;
+
+ /* flush the header so it will be used as streamheader */
+- put_flush_packet (&ffmpegmux->context->pb);
++ put_flush_packet (ffmpegmux->context->pb);
+ }
+
+ /* take the one with earliest timestamp,
+@@ -556,8 +556,8 @@ gst_ffmpegmux_collected (GstCollectPads
+ /* close down */
+ av_write_trailer (ffmpegmux->context);
+ ffmpegmux->opened = FALSE;
+- put_flush_packet (&ffmpegmux->context->pb);
+- url_fclose (&ffmpegmux->context->pb);
++ put_flush_packet (ffmpegmux->context->pb);
++ url_fclose (ffmpegmux->context->pb);
+ gst_pad_push_event (ffmpegmux->srcpad, gst_event_new_eos ());
+ return GST_FLOW_UNEXPECTED;
+ }
+@@ -598,7 +598,7 @@ gst_ffmpegmux_change_state (GstElement *
+ }
+ if (ffmpegmux->opened) {
+ ffmpegmux->opened = FALSE;
+- url_fclose (&ffmpegmux->context->pb);
++ url_fclose (ffmpegmux->context->pb);
+ }
+ break;
+ case GST_STATE_CHANGE_READY_TO_NULL:
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/F-8/gstreamer-ffmpeg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gstreamer-ffmpeg.spec 24 Jul 2008 09:17:32 -0000 1.2
+++ gstreamer-ffmpeg.spec 16 Aug 2008 07:29:23 -0000 1.3
@@ -31,6 +31,12 @@
%patch0 -p1 -z .syslibs
%patch1 -p1
%patch2 -p1
+# adjust includes for the header move in latest ffmpeg <sigh>
+sed -i -e 's|avcodec.h|libavcodec/avcodec.h|g' \
+ -e 's|avformat.h|libavformat/avformat.h|g' \
+ -e 's|postprocess.h|libpostproc/postprocess.h|g' \
+ -e 's|swscale.h|libswscale/swscale.h|g' \
+ ext/ffmpeg/*.c ext/ffmpeg/*.h ext/libpostproc/*.c
%build
15 years, 8 months
rpms/gstreamer-plugins-bad/F-8 gst-plugins-bad-0.10.5-new-mjpegtools.patch, NONE, 1.1 gstreamer-plugins-bad.spec, 1.2, 1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22958
Modified Files:
gstreamer-plugins-bad.spec
Added Files:
gst-plugins-bad-0.10.5-new-mjpegtools.patch
Log Message:
* Wed Jul 23 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.5-15
- Release bump for rpmfusion
gst-plugins-bad-0.10.5-new-mjpegtools.patch:
--- NEW FILE gst-plugins-bad-0.10.5-new-mjpegtools.patch ---
diff -up gst-plugins-bad-0.10.5/ext/mpeg2enc/gstmpeg2enc.cc~ gst-plugins-bad-0.10.5/ext/mpeg2enc/gstmpeg2enc.cc
--- gst-plugins-bad-0.10.5/ext/mpeg2enc/gstmpeg2enc.cc~ 2007-12-09 21:56:17.000000000 +0100
+++ gst-plugins-bad-0.10.5/ext/mpeg2enc/gstmpeg2enc.cc 2007-12-09 21:56:17.000000000 +0100
@@ -658,23 +658,16 @@ gst_mpeg2enc_log_callback (log_level_t l
{
GstDebugLevel gst_level;
- switch (level) {
- case LOG_NONE:
- gst_level = GST_LEVEL_NONE;
- break;
- case LOG_ERROR:
- gst_level = GST_LEVEL_ERROR;
- break;
- case LOG_INFO:
- gst_level = GST_LEVEL_INFO;
- break;
- case LOG_DEBUG:
- gst_level = GST_LEVEL_DEBUG;
- break;
- default:
- gst_level = GST_LEVEL_INFO;
- break;
- }
+ if (level == mjpeg_loglev_t("debug"))
+ gst_level = GST_LEVEL_DEBUG;
+ else if (level == mjpeg_loglev_t("info"))
+ gst_level = GST_LEVEL_INFO;
+ else if (level == mjpeg_loglev_t("warn"))
+ gst_level = GST_LEVEL_WARNING;
+ else if (level == mjpeg_loglev_t("error"))
+ gst_level = GST_LEVEL_ERROR;
+ else
+ gst_level = GST_LEVEL_INFO;
gst_debug_log (mpeg2enc_debug, gst_level, "", "", 0, NULL, message);
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/F-8/gstreamer-plugins-bad.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gstreamer-plugins-bad.spec 24 Jul 2008 09:51:10 -0000 1.2
+++ gstreamer-plugins-bad.spec 16 Aug 2008 07:28:54 -0000 1.3
@@ -26,6 +26,7 @@
Patch7: gst-plugins-bad-0.10.5-mms-connections-speed.patch
Patch8: gst-plugins-bad-0.10.5-mms-seek.patch
Patch9: gst-plugins-bad-0.10.5-flv.patch
+Patch10: gst-plugins-bad-0.10.5-new-mjpegtools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{gstreamer} >= %{gst_minver}
BuildRequires: %{gstreamer}-devel >= %{gst_minver}
@@ -117,6 +118,7 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
### Use correct soundtouch pkgconfig package name
%{__sed} -i -e 's|libSoundTouch|soundtouch-1.0|g' configure*
### only check minimum versions for mjpegtools and neon
15 years, 8 months