rpms/php-pecl-pdflib/devel php-pecl-pdflib.spec, 1.4, 1.5 php_pdflib.h, 1.1, NONE
by Remi Collet
Author: remi
Update of /cvs/nonfree/rpms/php-pecl-pdflib/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26005
Modified Files:
php-pecl-pdflib.spec
Removed Files:
php_pdflib.h
Log Message:
PHP 5.3.0 build
Index: php-pecl-pdflib.spec
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/php-pecl-pdflib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-pecl-pdflib.spec 29 Mar 2009 15:07:56 -0000 1.4
+++ php-pecl-pdflib.spec 14 Jul 2009 06:42:03 -0000 1.5
@@ -7,18 +7,14 @@
Summary: Package for generating PDF files
Summary(fr): Extension pour générer des fichiers PDF
Name: php-pecl-pdflib
-Version: 2.1.6
-Release: 2%{?dist}
+Version: 2.1.7
+Release: 1%{?dist}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/pdflib
Source: http://pecl.php.net/get/pdflib-%{version}.tgz
-# See http://pecl.php.net/bugs/bug.php?id=16066
-# http://cvs.php.net/viewvc.cgi/pecl/pdf/php_pdflib.h?view=co
-Source1: php_pdflib.h
-
Source2: xml2changelog
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,8 +50,7 @@
%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
cd pdflib-%{version}
-# Missing file
-cp %{SOURCE1} .
+
%build
cd pdflib-%{version}
@@ -109,6 +104,9 @@
%changelog
+* Tue Jul 14 2009 Remi Collet <rpmfusion(a)FamilleCollet.com> 2.1.7-1
+- update to 2.1.7, rebuild against php 5.3.0
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.1.6-2
- rebuild for new F11 features
--- php_pdflib.h DELETED ---
14 years, 9 months
rpms/VirtualBox-OSE-kmod/F-11 VirtualBox-OSE-kmod.spec,1.16,1.17
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30013
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
Bump the vbox modules for 3.0.2
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-11/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VirtualBox-OSE-kmod.spec 10 Jul 2009 15:43:38 -0000 1.16
+++ VirtualBox-OSE-kmod.spec 12 Jul 2009 11:36:44 -0000 1.17
@@ -6,7 +6,7 @@
#define buildforkernels newest
Name: VirtualBox-OSE-kmod
-Version: 3.0.0
+Version: 3.0.2
Release: 1%{?dist}
Summary: Kernel module for VirtualBox-OSE
@@ -78,7 +78,10 @@
%changelog
-* Fri Jul 3 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.0-1
+* Sun Jul 12 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.2-1
+- New release
+
+* Fri Jul 03 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.0-1
- New release
* Thu Jul 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-2
14 years, 9 months
rpms/VirtualBox-OSE-kmod/devel VirtualBox-OSE-kmod.spec,1.16,1.17
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30497/devel
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
Bump the vbox modules for 3.0.2
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VirtualBox-OSE-kmod.spec 9 Jul 2009 09:21:01 -0000 1.16
+++ VirtualBox-OSE-kmod.spec 12 Jul 2009 03:11:20 -0000 1.17
@@ -6,7 +6,7 @@
#define buildforkernels newest
Name: VirtualBox-OSE-kmod
-Version: 3.0.0
+Version: 3.0.2
Release: 1%{?dist}
Summary: Kernel module for VirtualBox-OSE
@@ -78,7 +78,10 @@
%changelog
-* Fri Jul 3 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.0-1
+* Sun Jul 12 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.2-1
+- New release
+
+* Fri Jul 03 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.0-1
- New release
* Thu Jul 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-2
14 years, 9 months
rpms/VirtualBox-OSE/devel .cvsignore, 1.5, 1.6 VirtualBox-OSE.spec, 1.11, 1.12 sources, 1.5, 1.6 VirtualBox-OSE-3.0.0-netfreeze.patch, 1.1, NONE
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30052
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Removed Files:
VirtualBox-OSE-3.0.0-netfreeze.patch
Log Message:
* Sun Jul 12 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-1
- New upstream release
- Dropping the upstreamed netfreeze patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 9 Jul 2009 08:03:08 -0000 1.5
+++ .cvsignore 12 Jul 2009 03:08:43 -0000 1.6
@@ -1,2 +1,2 @@
-VirtualBox-3.0.0-OSE.tar.bz2
+VirtualBox-3.0.2-OSE.tar.bz2
UserManual.pdf
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- VirtualBox-OSE.spec 10 Jul 2009 13:38:16 -0000 1.11
+++ VirtualBox-OSE.spec 12 Jul 2009 03:08:43 -0000 1.12
@@ -9,8 +9,8 @@
%bcond_without hardening
Name: VirtualBox-OSE
-Version: 3.0.0
-Release: 3%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -25,7 +25,6 @@
Source8: VirtualBox-OSE-vboxresize.desktop
Patch1: VirtualBox-OSE-2.2.0-noupdate.patch
Patch2: VirtualBox-OSE-3.0.0-strings.patch
-Patch3: VirtualBox-OSE-3.0.0-netfreeze.patch
Patch10: VirtualBox-OSE-2.2.0-32bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,7 +100,6 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
-%patch3 -p1 -b .netfreeze
%patch10 -p1 -b .32bit
# Remove prebuilt binary tools
@@ -350,6 +348,10 @@
%changelog
+* Sun Jul 12 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-1
+- New upstream release
+- Dropping the upstreamed netfreeze patch
+
* Fri Jul 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-3
- Fix freeze of guests on network load (upstream ticket/4343)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 9 Jul 2009 08:03:08 -0000 1.5
+++ sources 12 Jul 2009 03:08:43 -0000 1.6
@@ -1,2 +1,2 @@
-d1560d8b0a766236161eeb659e802b5a VirtualBox-3.0.0-OSE.tar.bz2
-e62fce82380b3368e2558a663715734c UserManual.pdf
+68e6658b8b11a509d7dec57835cba267 VirtualBox-3.0.2-OSE.tar.bz2
+4d0b51c0c4759dc34c124083bae73436 UserManual.pdf
--- VirtualBox-OSE-3.0.0-netfreeze.patch DELETED ---
14 years, 9 months
rpms/VirtualBox-OSE/F-11 .cvsignore, 1.5, 1.6 VirtualBox-OSE.spec, 1.7, 1.8 sources, 1.5, 1.6
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29901
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Log Message:
* Sun Jul 12 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-1
- New upstream release
- Dropping the upstreamed netfreeze patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 10 Jul 2009 13:53:59 -0000 1.5
+++ .cvsignore 12 Jul 2009 03:07:37 -0000 1.6
@@ -1,2 +1,2 @@
-VirtualBox-3.0.0-OSE.tar.bz2
+VirtualBox-3.0.2-OSE.tar.bz2
UserManual.pdf
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/VirtualBox-OSE.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VirtualBox-OSE.spec 10 Jul 2009 13:53:59 -0000 1.7
+++ VirtualBox-OSE.spec 12 Jul 2009 03:07:37 -0000 1.8
@@ -9,8 +9,8 @@
%bcond_without hardening
Name: VirtualBox-OSE
-Version: 3.0.0
-Release: 3%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -25,7 +25,6 @@
Source8: VirtualBox-OSE-vboxresize.desktop
Patch1: VirtualBox-OSE-2.2.0-noupdate.patch
Patch2: VirtualBox-OSE-3.0.0-strings.patch
-Patch3: VirtualBox-OSE-3.0.0-netfreeze.patch
Patch10: VirtualBox-OSE-2.2.0-32bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,7 +100,6 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
-%patch3 -p1 -b .netfreeze
%patch10 -p1 -b .32bit
# Remove prebuilt binary tools
@@ -350,6 +348,10 @@
%changelog
+* Sun Jul 12 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-1
+- New upstream release
+- Dropping the upstreamed netfreeze patch
+
* Fri Jul 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-3
- Fix freeze of guests on network load (upstream ticket/4343)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 10 Jul 2009 13:53:59 -0000 1.5
+++ sources 12 Jul 2009 03:07:37 -0000 1.6
@@ -1,2 +1,2 @@
-d1560d8b0a766236161eeb659e802b5a VirtualBox-3.0.0-OSE.tar.bz2
-e62fce82380b3368e2558a663715734c UserManual.pdf
+68e6658b8b11a509d7dec57835cba267 VirtualBox-3.0.2-OSE.tar.bz2
+4d0b51c0c4759dc34c124083bae73436 UserManual.pdf
14 years, 9 months
rpms/cairo-dock/F-11 .cvsignore, 1.19, 1.20 cairo-dock.spec, 1.26, 1.27 sources, 1.21, 1.22
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10249/F-11
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sun Jul 12 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.8-1
- 2.0.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 5 Jul 2009 12:49:44 -0000 1.19
+++ .cvsignore 11 Jul 2009 17:04:15 -0000 1.20
@@ -1,2 +1,2 @@
-cairo-dock-2.0.7.tar.bz2
-cairo-dock-plugins-2.0.7.tar.bz2
+cairo-dock-2.0.8.tar.bz2
+cairo-dock-plugins-2.0.8.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/cairo-dock.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cairo-dock.spec 5 Jul 2009 12:49:44 -0000 1.26
+++ cairo-dock.spec 11 Jul 2009 17:04:16 -0000 1.27
@@ -11,7 +11,7 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.7
+%global mainver 2.0.8
%undefine betaver
%global build_themes 0
@@ -634,6 +634,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sun Jul 12 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.8-1
+- 2.0.8
+
* Fri Jul 3 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.7-1
- 2.0.7
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 5 Jul 2009 12:49:44 -0000 1.21
+++ sources 11 Jul 2009 17:04:16 -0000 1.22
@@ -1,2 +1,2 @@
-856c7751a9af3bc58ee167dd9b7b5317 cairo-dock-2.0.7.tar.bz2
-e35eaebbaa22340479fad7952d16a14c cairo-dock-plugins-2.0.7.tar.bz2
+bf591fb0833c41c8d6dec327d847b681 cairo-dock-2.0.8.tar.bz2
+b109a51e88b4228704fedec84d5266c8 cairo-dock-plugins-2.0.8.tar.bz2
14 years, 9 months
rpms/cairo-dock/devel .cvsignore, 1.27, 1.28 cairo-dock.spec, 1.34, 1.35 sources, 1.29, 1.30
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10249/devel
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sun Jul 12 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.8-1
- 2.0.8
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 5 Jul 2009 12:49:45 -0000 1.27
+++ .cvsignore 11 Jul 2009 17:04:16 -0000 1.28
@@ -1,2 +1,2 @@
-cairo-dock-2.0.7.tar.bz2
-cairo-dock-plugins-2.0.7.tar.bz2
+cairo-dock-2.0.8.tar.bz2
+cairo-dock-plugins-2.0.8.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cairo-dock.spec 5 Jul 2009 12:49:45 -0000 1.34
+++ cairo-dock.spec 11 Jul 2009 17:04:16 -0000 1.35
@@ -11,7 +11,7 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.7
+%global mainver 2.0.8
%undefine betaver
%global build_themes 0
@@ -634,6 +634,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sun Jul 12 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.8-1
+- 2.0.8
+
* Fri Jul 3 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.7-1
- 2.0.7
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 5 Jul 2009 12:49:45 -0000 1.29
+++ sources 11 Jul 2009 17:04:16 -0000 1.30
@@ -1,2 +1,2 @@
-856c7751a9af3bc58ee167dd9b7b5317 cairo-dock-2.0.7.tar.bz2
-e35eaebbaa22340479fad7952d16a14c cairo-dock-plugins-2.0.7.tar.bz2
+bf591fb0833c41c8d6dec327d847b681 cairo-dock-2.0.8.tar.bz2
+b109a51e88b4228704fedec84d5266c8 cairo-dock-plugins-2.0.8.tar.bz2
14 years, 9 months
rpms/VirtualBox-OSE-kmod/F-11 VirtualBox-OSE-kmod.spec,1.15,1.16
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3706
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
Merge vbox modules from devel
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-11/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- VirtualBox-OSE-kmod.spec 21 Jun 2009 10:15:23 -0000 1.15
+++ VirtualBox-OSE-kmod.spec 10 Jul 2009 15:43:38 -0000 1.16
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: VirtualBox-OSE-kmod
-Version: 2.2.4
-Release: 1%{?dist}.2
+Version: 3.0.0
+Release: 1%{?dist}
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -55,7 +55,7 @@
%build
for kernel_version in %{?kernel_versions}; do
- for module in vbox{drv,netflt,add,vfs}; do
+ for module in vbox{drv,netflt,add,vfs,video_drm}; do
make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules
done
done
@@ -78,8 +78,11 @@
%changelog
-* Sun Jun 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.4-1.2
-- rebuild for new kernels
+* Fri Jul 3 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.0-1
+- New release
+
+* Thu Jul 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-2
+- Enable the DRM module
* Fri Jun 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.4-1.1
- rebuild for final F11 kernel
14 years, 9 months
rpms/kino/devel kino-1.3.3-ffmpeg-metadata.patch, NONE, 1.1 kino.spec, 1.9, 1.10
by Dan Horák
Author: sharkcz
Update of /cvs/free/rpms/kino/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3242
Modified Files:
kino.spec
Added Files:
kino-1.3.3-ffmpeg-metadata.patch
Log Message:
* Fri Jul 10 2009 Dan Horák <dan at danny.cz> - 1.3.3-4
- fix export scripts for new ffmpeg (#713)
kino-1.3.3-ffmpeg-metadata.patch:
--- NEW FILE kino-1.3.3-ffmpeg-metadata.patch ---
diff --git a/scripts/exports/ffmpeg_h264.sh b/scripts/exports/ffmpeg_h264.sh
index bfc08e3..76f69b2 100755
--- a/scripts/exports/ffmpeg_h264.sh
+++ b/scripts/exports/ffmpeg_h264.sh
@@ -53,24 +53,24 @@ execute()
case "$profile" in
"0" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 -g 300 $hq $interlace -aspect $aspect -qscale 2 -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"1" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 -g 300 $hq $progressive -s $full_res -aspect $aspect -qscale 2 -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"2" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 -g 300 $hq $progressive -s $med_res -aspect $aspect -qscale 4 -ab 128$audio_kilo -ar 44100 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"3" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 -g 300 $hq $progressive -s $med_res -aspect $aspect -b 500$kilo -ab 64$audio_kilo -ar 32000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"4" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 $hq -r 12 -g 120 $progressive -s qcif -aspect $aspect -b 90$kilo -minrate 0 -maxrate 100$kilo -bufsize 40$bufsize \
-ac 1 -ab 28$audio_kilo -ar 16000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
esac
}
diff --git a/scripts/exports/ffmpeg_h264_dual.sh b/scripts/exports/ffmpeg_h264_dual.sh
index 021576a..fec4981 100755
--- a/scripts/exports/ffmpeg_h264_dual.sh
+++ b/scripts/exports/ffmpeg_h264_dual.sh
@@ -58,24 +58,24 @@ execute()
case "$profile" in
"0" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 -g 300 $hq $interlace -aspect $aspect -b 2048$kilo -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"1" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 -g 300 $hq $progressive -s $full_res -aspect $aspect -b 2048$kilo -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"2" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 -g 300 $hq $progressive -s $med_res -aspect $aspect -b 1024$kilo -ab 128$audio_kilo -ar 44100 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"3" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 -g 300 $hq $progressive -s $med_res -aspect $aspect -b 500$kilo -ab 64$audio_kilo -ar 32000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"4" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 $hq $progressive -r 12 -g 120 -s qcif -aspect $aspect -b 90$kilo -minrate 0 -maxrate 100$kilo -bufsize 40$bufsize \
-ac 1 -ab 24$audio_kilo -ar 16000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
esac
[ $pass -eq "2" ] && rm -f "$file-0.log"
diff --git a/scripts/exports/ffmpeg_h264_ps3.sh b/scripts/exports/ffmpeg_h264_ps3.sh
index f8c357b..b9f1609 100755
--- a/scripts/exports/ffmpeg_h264_ps3.sh
+++ b/scripts/exports/ffmpeg_h264_ps3.sh
@@ -36,25 +36,12 @@ execute()
# generate filename if missing
[ "x$file" = "x" ] && file="kino_export_"`date +%Y-%m-%d_%H.%M.%S`
- # Create metadata options
- title=`awk '/title="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /title=/) z = y + 1; print x[z]; exit}' "$project"`
- author=`awk '/author="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /author=/) z = y + 1; print x[z]; exit}' "$project"`
- comment=`awk '/abstract="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /abstract=/) z = y + 1; print x[z]; exit}' "$project"`
- copyright=`awk '/copyright="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /copyright=/) z = y + 1; print x[z]; exit}' "$project"`
-
# Run the command
case "$pass" in
"1" ) ffmpeg -threads 0 -f dv -i pipe: -pass 1 -passlogfile "$file" \
-vcodec $x264 -vpre fastfirstpass -level 41 -g 300 $interlace -aspect $aspect -b 2048$kilo -bt 4096$kilo \
-an -f rawvideo -y /dev/null
;;
-
- "2" ) ffmpeg -threads 0 -f dv -i pipe: -pass 2 -passlogfile "$file" \
- -vcodec $x264 -vpre hq -level 41 -g 300 $interlace -aspect $aspect -b 2048$kilo -bt 4096$kilo \
- -ab 192$audio_kilo -ar 44100 -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
- -y "$file".mp4
- rm -f "$file-0.log"
- ;;
esac
}
diff --git a/scripts/exports/ffmpeg_mp4.sh b/scripts/exports/ffmpeg_mp4.sh
index 368fe1d..568caa4 100755
--- a/scripts/exports/ffmpeg_mp4.sh
+++ b/scripts/exports/ffmpeg_mp4.sh
@@ -45,26 +45,26 @@ execute()
copyright=`awk '/copyright="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /copyright=/) z = y + 1; print x[z]; exit}' "$project"`
# Run the command
- case "$profile" in
+ case "$profile" in
"0" ) ffmpeg -threads $threads -f dv -i pipe: \
-g 300 $hq $interlace -aspect $aspect -qscale 2 -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"1" ) ffmpeg -threads $threads -f dv -i pipe: \
-g 300 $hq $progressive -s $full_res -aspect $aspect -qscale 2 $qpel -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"2" ) ffmpeg -threads $threads -f dv -i pipe: \
-g 300 $hq $progressive -s $med_res -aspect $aspect -qscale 4 -ab 128$audio_kilo -ar 44100 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"3" ) ffmpeg -threads $threads -f dv -i pipe: \
-g 300 $hq $progressive -s $med_res -aspect $aspect -b 500$kilo -g 60 -ab 64$audio_kilo -ar 32000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"4" ) ffmpeg -threads $threads -f dv -i pipe: \
$hq -r 12 -g 120 $progressive -s $low_res -aspect $aspect -b 96$kilo -ac 1 -ab 32$audio_kilo -ar 22050 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
esac
}
diff --git a/scripts/exports/ffmpeg_mp4_dual.sh b/scripts/exports/ffmpeg_mp4_dual.sh
index f393fa5..b9cddc9 100755
--- a/scripts/exports/ffmpeg_mp4_dual.sh
+++ b/scripts/exports/ffmpeg_mp4_dual.sh
@@ -51,23 +51,23 @@ execute()
case "$profile" in
"0" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-g 300 $hq $interlace -aspect $aspect -b 2048$kilo -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"1" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-g 300 $hq $progressive -s $full_res -aspect $aspect -b 2048$kilo -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"2" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-g 300 $hq $progressive -s $med_res -aspect $aspect -b 1024$kilo -ab 128$audio_kilo -ar 44100 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"3" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-g 300 $hq $progressive -s $med_res -aspect $aspect -b 500$kilo -g 60 -ab 64$audio_kilo -ar 32000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"4" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
$hq -r 12 -g 120 $progressive -s $low_res -aspect $aspect -b 96$kilo -ac 1 -ab 32$audio_kilo -ar 22050 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
esac
[ $pass -eq "2" ] && rm -f "$file-0.log"
diff --git a/scripts/exports/ffmpeg_utils.sh b/scripts/exports/ffmpeg_utils.sh
index 9c6c308..6e149e6 100644
--- a/scripts/exports/ffmpeg_utils.sh
+++ b/scripts/exports/ffmpeg_utils.sh
@@ -31,6 +31,12 @@ if [ "$1" != "--usage" ] && [ "x$1" != "x" ]; then
med_res=`[ "$normalisation" = "pal" ] && echo "384x288" || echo "320x240"`
low_res=`[ "$normalisation" = "pal" ] && echo "192x144" || echo "160x120"`
fi
+
+ test_metadata=`echo $ffmpeg_help | grep '\-metadata' | wc -l`
+ opt_title=`[ "$test_metadata" -gt 0 ] && echo "-metadata title=" || "-title "`
+ opt_author=`[ "$test_metadata" -gt 0 ] && echo "-metadata author=" || "-author "`
+ opt_comment=`[ "$test_metadata" -gt 0 ] && echo "-metadata comment=" || "-comment "`
+ opt_copyright=`[ "$test_metadata" -gt 0 ] && echo "-metadata copyright=" || "-copyright "`
fi
# Generate FFMPEG hiqh quality settings based upon version
Index: kino.spec
===================================================================
RCS file: /cvs/free/rpms/kino/devel/kino.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kino.spec 26 May 2009 12:03:58 -0000 1.9
+++ kino.spec 10 Jul 2009 15:37:59 -0000 1.10
@@ -1,6 +1,6 @@
Name: kino
Version: 1.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Kino is a non-linear DV editor for GNU/Linux
Group: Applications/Multimedia
@@ -9,6 +9,7 @@
Source0: http://dl.sf.net/kino/kino-%{version}.tar.gz
Source1: ffmpeg2dirac.sh
Patch0: %{name}-udev.patch
+Patch1: %{name}-1.3.3-ffmpeg-metadata.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
@@ -51,6 +52,7 @@
%prep
%setup -q
%patch0 -p1 -b .udev
+%patch1 -p1 -b .metadata
%build
@@ -105,6 +107,9 @@
%{_includedir}/kino
%changelog
+* Fri Jul 10 2009 Dan Horák <dan at danny.cz> - 1.3.3-4
+- fix export scripts for new ffmpeg (#713)
+
* Tue May 26 2009 Dan Horák <dan at danny.cz> - 1.3.3-3
- add ffmpeg2dirac export script
14 years, 9 months
rpms/kino/F-11 kino-1.3.3-ffmpeg-metadata.patch, NONE, 1.1 kino.spec, 1.9, 1.10
by Dan Horák
Author: sharkcz
Update of /cvs/free/rpms/kino/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3088
Modified Files:
kino.spec
Added Files:
kino-1.3.3-ffmpeg-metadata.patch
Log Message:
* Fri Jul 10 2009 Dan Horák <dan at danny.cz> - 1.3.3-4
- fix export scripts for new ffmpeg (#713)
kino-1.3.3-ffmpeg-metadata.patch:
--- NEW FILE kino-1.3.3-ffmpeg-metadata.patch ---
diff --git a/scripts/exports/ffmpeg_h264.sh b/scripts/exports/ffmpeg_h264.sh
index bfc08e3..76f69b2 100755
--- a/scripts/exports/ffmpeg_h264.sh
+++ b/scripts/exports/ffmpeg_h264.sh
@@ -53,24 +53,24 @@ execute()
case "$profile" in
"0" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 -g 300 $hq $interlace -aspect $aspect -qscale 2 -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"1" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 -g 300 $hq $progressive -s $full_res -aspect $aspect -qscale 2 -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"2" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 -g 300 $hq $progressive -s $med_res -aspect $aspect -qscale 4 -ab 128$audio_kilo -ar 44100 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"3" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 -g 300 $hq $progressive -s $med_res -aspect $aspect -b 500$kilo -ab 64$audio_kilo -ar 32000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"4" ) ffmpeg -threads $threads -f dv -i pipe: \
-vcodec $x264 $hq -r 12 -g 120 $progressive -s qcif -aspect $aspect -b 90$kilo -minrate 0 -maxrate 100$kilo -bufsize 40$bufsize \
-ac 1 -ab 28$audio_kilo -ar 16000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
esac
}
diff --git a/scripts/exports/ffmpeg_h264_dual.sh b/scripts/exports/ffmpeg_h264_dual.sh
index 021576a..fec4981 100755
--- a/scripts/exports/ffmpeg_h264_dual.sh
+++ b/scripts/exports/ffmpeg_h264_dual.sh
@@ -58,24 +58,24 @@ execute()
case "$profile" in
"0" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 -g 300 $hq $interlace -aspect $aspect -b 2048$kilo -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"1" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 -g 300 $hq $progressive -s $full_res -aspect $aspect -b 2048$kilo -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"2" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 -g 300 $hq $progressive -s $med_res -aspect $aspect -b 1024$kilo -ab 128$audio_kilo -ar 44100 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"3" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 -g 300 $hq $progressive -s $med_res -aspect $aspect -b 500$kilo -ab 64$audio_kilo -ar 32000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"4" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-vcodec $x264 $hq $progressive -r 12 -g 120 -s qcif -aspect $aspect -b 90$kilo -minrate 0 -maxrate 100$kilo -bufsize 40$bufsize \
-ac 1 -ab 24$audio_kilo -ar 16000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
esac
[ $pass -eq "2" ] && rm -f "$file-0.log"
diff --git a/scripts/exports/ffmpeg_h264_ps3.sh b/scripts/exports/ffmpeg_h264_ps3.sh
index f8c357b..b9f1609 100755
--- a/scripts/exports/ffmpeg_h264_ps3.sh
+++ b/scripts/exports/ffmpeg_h264_ps3.sh
@@ -36,25 +36,12 @@ execute()
# generate filename if missing
[ "x$file" = "x" ] && file="kino_export_"`date +%Y-%m-%d_%H.%M.%S`
- # Create metadata options
- title=`awk '/title="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /title=/) z = y + 1; print x[z]; exit}' "$project"`
- author=`awk '/author="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /author=/) z = y + 1; print x[z]; exit}' "$project"`
- comment=`awk '/abstract="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /abstract=/) z = y + 1; print x[z]; exit}' "$project"`
- copyright=`awk '/copyright="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /copyright=/) z = y + 1; print x[z]; exit}' "$project"`
-
# Run the command
case "$pass" in
"1" ) ffmpeg -threads 0 -f dv -i pipe: -pass 1 -passlogfile "$file" \
-vcodec $x264 -vpre fastfirstpass -level 41 -g 300 $interlace -aspect $aspect -b 2048$kilo -bt 4096$kilo \
-an -f rawvideo -y /dev/null
;;
-
- "2" ) ffmpeg -threads 0 -f dv -i pipe: -pass 2 -passlogfile "$file" \
- -vcodec $x264 -vpre hq -level 41 -g 300 $interlace -aspect $aspect -b 2048$kilo -bt 4096$kilo \
- -ab 192$audio_kilo -ar 44100 -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
- -y "$file".mp4
- rm -f "$file-0.log"
- ;;
esac
}
diff --git a/scripts/exports/ffmpeg_mp4.sh b/scripts/exports/ffmpeg_mp4.sh
index 368fe1d..568caa4 100755
--- a/scripts/exports/ffmpeg_mp4.sh
+++ b/scripts/exports/ffmpeg_mp4.sh
@@ -45,26 +45,26 @@ execute()
copyright=`awk '/copyright="/ {split($0, x, "\""); z = 0; for (y in x) if (x[y] ~ /copyright=/) z = y + 1; print x[z]; exit}' "$project"`
# Run the command
- case "$profile" in
+ case "$profile" in
"0" ) ffmpeg -threads $threads -f dv -i pipe: \
-g 300 $hq $interlace -aspect $aspect -qscale 2 -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"1" ) ffmpeg -threads $threads -f dv -i pipe: \
-g 300 $hq $progressive -s $full_res -aspect $aspect -qscale 2 $qpel -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"2" ) ffmpeg -threads $threads -f dv -i pipe: \
-g 300 $hq $progressive -s $med_res -aspect $aspect -qscale 4 -ab 128$audio_kilo -ar 44100 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"3" ) ffmpeg -threads $threads -f dv -i pipe: \
-g 300 $hq $progressive -s $med_res -aspect $aspect -b 500$kilo -g 60 -ab 64$audio_kilo -ar 32000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"4" ) ffmpeg -threads $threads -f dv -i pipe: \
$hq -r 12 -g 120 $progressive -s $low_res -aspect $aspect -b 96$kilo -ac 1 -ab 32$audio_kilo -ar 22050 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
esac
}
diff --git a/scripts/exports/ffmpeg_mp4_dual.sh b/scripts/exports/ffmpeg_mp4_dual.sh
index f393fa5..b9cddc9 100755
--- a/scripts/exports/ffmpeg_mp4_dual.sh
+++ b/scripts/exports/ffmpeg_mp4_dual.sh
@@ -51,23 +51,23 @@ execute()
case "$profile" in
"0" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-g 300 $hq $interlace -aspect $aspect -b 2048$kilo -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"1" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-g 300 $hq $progressive -s $full_res -aspect $aspect -b 2048$kilo -ab 192$audio_kilo \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"2" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-g 300 $hq $progressive -s $med_res -aspect $aspect -b 1024$kilo -ab 128$audio_kilo -ar 44100 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"3" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
-g 300 $hq $progressive -s $med_res -aspect $aspect -b 500$kilo -g 60 -ab 64$audio_kilo -ar 32000 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
"4" ) ffmpeg -threads $threads -f dv -i pipe: -pass $pass -passlogfile "$file" \
$hq -r 12 -g 120 $progressive -s $low_res -aspect $aspect -b 96$kilo -ac 1 -ab 32$audio_kilo -ar 22050 \
- -title "$title" -author "$author" -comment "$comment" -copyright "$copyright" \
+ ${opt_title}"${title}" ${opt_author}"${author}" ${opt_comment}"${comment}" ${opt_copyright}"${copyright}" \
-y "$file".mp4 ;;
esac
[ $pass -eq "2" ] && rm -f "$file-0.log"
diff --git a/scripts/exports/ffmpeg_utils.sh b/scripts/exports/ffmpeg_utils.sh
index 9c6c308..6e149e6 100644
--- a/scripts/exports/ffmpeg_utils.sh
+++ b/scripts/exports/ffmpeg_utils.sh
@@ -31,6 +31,12 @@ if [ "$1" != "--usage" ] && [ "x$1" != "x" ]; then
med_res=`[ "$normalisation" = "pal" ] && echo "384x288" || echo "320x240"`
low_res=`[ "$normalisation" = "pal" ] && echo "192x144" || echo "160x120"`
fi
+
+ test_metadata=`echo $ffmpeg_help | grep '\-metadata' | wc -l`
+ opt_title=`[ "$test_metadata" -gt 0 ] && echo "-metadata title=" || "-title "`
+ opt_author=`[ "$test_metadata" -gt 0 ] && echo "-metadata author=" || "-author "`
+ opt_comment=`[ "$test_metadata" -gt 0 ] && echo "-metadata comment=" || "-comment "`
+ opt_copyright=`[ "$test_metadata" -gt 0 ] && echo "-metadata copyright=" || "-copyright "`
fi
# Generate FFMPEG hiqh quality settings based upon version
Index: kino.spec
===================================================================
RCS file: /cvs/free/rpms/kino/F-11/kino.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kino.spec 26 May 2009 12:03:58 -0000 1.9
+++ kino.spec 10 Jul 2009 15:36:26 -0000 1.10
@@ -1,6 +1,6 @@
Name: kino
Version: 1.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Kino is a non-linear DV editor for GNU/Linux
Group: Applications/Multimedia
@@ -9,6 +9,7 @@
Source0: http://dl.sf.net/kino/kino-%{version}.tar.gz
Source1: ffmpeg2dirac.sh
Patch0: %{name}-udev.patch
+Patch1: %{name}-1.3.3-ffmpeg-metadata.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
@@ -51,6 +52,7 @@
%prep
%setup -q
%patch0 -p1 -b .udev
+%patch1 -p1 -b .metadata
%build
@@ -105,6 +107,9 @@
%{_includedir}/kino
%changelog
+* Fri Jul 10 2009 Dan Horák <dan at danny.cz> - 1.3.3-4
+- fix export scripts for new ffmpeg (#713)
+
* Tue May 26 2009 Dan Horák <dan at danny.cz> - 1.3.3-3
- add ffmpeg2dirac export script
14 years, 9 months