rpms/kino/F-9 kino-ffmpeg.patch, NONE, 1.1 kino-gcc43.patch, NONE, 1.1 kino-udev.patch, NONE, 1.1 kino.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Dan Horák]

Author: sharkcz

Update of /cvs/free/rpms/kino/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6031

Modified Files:
	.cvsignore sources 
Added Files:
	kino-ffmpeg.patch kino-gcc43.patch kino-udev.patch kino.spec 
Log Message:
initial import

kino-ffmpeg.patch:

--- NEW FILE kino-ffmpeg.patch ---
diff -Nru kino-1.3.0.orig/src/frame.h kino-1.3.0/src/frame.h
--- kino-1.3.0.orig/src/frame.h	2007-11-08 05:34:06.000000000 +0100
+++ kino-1.3.0/src/frame.h	2008-08-11 08:48:35.000000000 +0200
@@ -48,10 +48,10 @@
 #if defined(HAVE_LIBAVCODEC)
 extern "C"
 {
-#   include <avcodec.h>
-#   include <avformat.h>
+#   include <libavcodec/avcodec.h>
+#   include <libavformat/avformat.h>
 #ifdef HAVE_SWSCALE
-#   include <swscale.h>
+#   include <libswscale/swscale.h>
 #endif
 }
 #endif

kino-gcc43.patch:

--- NEW FILE kino-gcc43.patch ---
diff -up kino-1.2.0/src/playlist.cc.gcc43 kino-1.2.0/src/playlist.cc
--- kino-1.2.0/src/playlist.cc.gcc43	2007-09-13 06:32:25.000000000 +0200
+++ kino-1.2.0/src/playlist.cc	2008-01-13 13:12:02.000000000 +0100
@@ -29,6 +29,7 @@
 #include <string>
 #include <list>
 #include <map>
+#include <algorithm>
 
 using std::cerr;
 using std::endl;

kino-udev.patch:

--- NEW FILE kino-udev.patch ---
--- kino-1.0.0/kino.rules.udev	2007-02-05 04:49:31.000000000 +0100
+++ kino-1.0.0/kino.rules	2007-06-19 09:06:57.000000000 +0200
@@ -8,20 +8,20 @@
 SUBSYSTEM!="input", GOTO="kino_rules_end"
 
 # Contour ShuttlePro
-ATTRS{idVendor}=="0b33", ATTRS{idProduct}=="0010", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
+SYSFS{idVendor}=="0b33", SYSFS{idProduct}=="0010", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
 # Contour ShuttlePro
-ATTRS{idVendor}=="0b33", ATTRS{idProduct}=="0011", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
+SYSFS{idVendor}=="0b33", SYSFS{idProduct}=="0011", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
 # Contour ShuttlePro
-ATTRS{idVendor}=="05f3", ATTRS{idProduct}=="0240", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
+SYSFS{idVendor}=="05f3", SYSFS{idProduct}=="0240", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
 # Contour ShuttleXPress
-ATTRS{idVendor}=="0b33", ATTRS{idProduct}=="0030", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
+SYSFS{idVendor}=="0b33", SYSFS{idProduct}=="0030", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
 # Contour ShuttlePRO v2
-ATTRS{idVendor}=="0b33", ATTRS{idProduct}=="0030", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
+SYSFS{idVendor}=="0b33", SYSFS{idProduct}=="0030", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
 # JLCooper MCS3
-ATTRS{idVendor}=="0760", ATTRS{idProduct}=="0001", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
+SYSFS{idVendor}=="0760", SYSFS{idProduct}=="0001", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
 # Griffin PowerMate
-ATTRS{idVendor}=="077d", ATTRS{idProduct}=="0410", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
+SYSFS{idVendor}=="077d", SYSFS{idProduct}=="0410", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
 # X-Keys Editor
-ATTRS{idVendor}=="05f3", ATTRS{idProduct}=="0241", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
+SYSFS{idVendor}=="05f3", SYSFS{idProduct}=="0241", MODE="644", RUN+="/usr/bin/killall --quiet -USR2 kino"
 
 LABEL="kino_rules_end"


--- NEW FILE kino.spec ---
Name:           kino
Version:        1.3.0
Release:        2%{?dist}
Summary:        Kino is a non-linear DV editor for GNU/Linux

Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://www.kinodv.org
Source0:        http://dl.sf.net/kino/kino-%{version}.tar.gz
Patch0:         %{name}-udev.patch
Patch3:         %{name}-gcc43.patch
Patch4:         %{name}-ffmpeg.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gtk2-devel
BuildRequires: glib2-devel
BuildRequires: libxml2-devel 
BuildRequires: libraw1394-devel
BuildRequires: libavc1394-devel
BuildRequires: libiec61883-devel
BuildRequires: libdv-devel >= 0.102
BuildRequires: libXv-devel
BuildRequires: libbonoboui-devel
BuildRequires: libquicktime-devel
BuildRequires: ffmpeg-devel
BuildRequires: desktop-file-utils
BuildRequires: libsamplerate-devel
BuildRequires: zlib-devel
BuildRequires: gettext
BuildRequires: perl(XML::Parser)

Requires: audiofile
Requires: esound
Requires: ffmpeg

%description
Kino is a non-linear DV editor for GNU/Linux. It features excellent
integration with IEEE 1394 for capture, VTR control, and recording
back to the camera. It captures video to disk in AVI format in both
type-1 DV and type-2 DV (separate audio stream) encodings.

%package        devel
Summary:        Files needed to build kino plugins
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
Files needed to build kino plugins

%prep
%setup -q
%patch0 -p1 -b .udev
%patch3 -p1 -b .gcc43
%patch4 -p1 -b .ffmpeg


%build
%configure --enable-quicktime --disable-local-ffmpeg \
           --disable-static \
           --disable-dependency-tracking \

%{__make} %{?_smp_mflags}


%install
%{__rm} -rf ${RPM_BUILD_ROOT}
%{__make} install DESTDIR=${RPM_BUILD_ROOT}
%{__rm} ${RPM_BUILD_ROOT}%{_libdir}/kino-gtk2/*.la
ln -sf kino ${RPM_BUILD_ROOT}%{_bindir}/kino2raw
%{__rm} ${RPM_BUILD_ROOT}%{_datadir}/applications/Kino.desktop
ln -s Kino.desktop kino.desktop

%find_lang kino

desktop-file-install \
    --vendor=livna \
    --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
    --add-category=X-Livna \
    kino.desktop


%check
%{__make} check


%clean
%{__rm} -rf ${RPM_BUILD_ROOT}

%files -f kino.lang
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING ChangeLog NEWS README* TODO
%{_bindir}/kino
%{_bindir}/kino2raw
%{_mandir}/man1/*
%{_datadir}/kino
%{_datadir}/applications/*kino.desktop
%{_datadir}/pixmaps/kino.png
%config(noreplace) %{_sysconfdir}/udev/rules.d/kino.rules
%{_datadir}/mime/packages/kino.xml
%{_libdir}/kino-gtk2

%files devel
%defattr(-,root,root,-)
%{_includedir}/kino

%changelog
* Mon Aug 11 2008 Dan Horák <dan at danny.cz> - 1.3.0-2
- fix build with new ffmpeg

* Mon Mar 03 2008 Dan Horák <dan at danny.cz> - 1.3.0-1
1.3.0
- dropped upstream'd patches

* Sun Jan 13 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.0-1
1.2.0
- fix build against libquicktime (patch by Dan Horák)
- fix building with gcc-4.3

* Sun Nov 25 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.1.1-3
- rebuilt

* Sun Aug 19 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.1.1-2
- require ffmpeg (needed for lots of functions)

* Wed Aug 08 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.1.1-1
1.1.1
- fix build (patch by Dan Horák)

* Tue Jun 19 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0.0-2
- fix up udev rules file
- remove redundant BR

* Thu Jun 07 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0.0-1
1.0.0
- adapt to upstream changes
- fix unowned dirs (#1457)
- fix kino2raw symlink
- drop kino.desktop, upstream ships a good desktop file

* Sun Feb  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9.5-2
- Rebuild.

* Tue Jan 16 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.9.5-1
0.9.5-1
 - dropped upstreamed patches
 - URL update

* Wed Jan 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.9.4-1
0.9.4-1
- patch for better plugin linking by Dan Horak
- patch to fix build with libswscale
- clean up BuildRequires
- don't build static libs

* Fri Dec 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.9.3-2
- Rebuild.

* Mon Nov 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.3-1
- version upgrade (#1257)
- plugins are now included the right way (#1193)

* Wed Oct 11 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.2-1
- version upgrade

* Thu Mar 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.8.0-2
- fix devel build (#795)

* 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

* Wed Jan 25 2006 Adrian Reber <adrian at lisas.de> - 0.8.0-0.lvn.1
- Updated to 0.8.0
- Dropped 0 Epoch
- Changes for modular X

* Tue Sep 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- finally fix #502

* Sat Jun 04 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info>
- send error output of lqt-config to /dev/null; fixes building with svn-to-srpm

* Mon May 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.6-0.lvn.2
- Fix #441

* Sun May 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.6-0.lvn.1
- Version upgrade
- Add libquicktime fixes and spec cleanups from Ville Skyttä (#437)

* Tue May 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.5-2.lvn.3
- Added missing buildrequires for gettext

* Mon May  9 2005 Dams <anvil[AT]livna.org> 
0:0.7.5-2.lvn.2
- Minor details corrections

* Tue Feb 15 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.5-2.lvn.1
- add libquicktime and ffmpeg
- add lvn tag

* Sun Feb 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.7.5-1
- drop fdr 
- minor beautifications

* Thu Nov 25 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.5-0.fdr.1
- Version upgrade (0.7.5)

* Tue Jul 27 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
0:0.7.2-0.fdr.2
- added missing BuildRequires libsamplerate
- require libdv >= 0.102

* Tue Jul 27 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
0:0.7.2-0.fdr.1
- Version upgrade (0.7.2)

* Mon May 31 2004 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0:0.7.1-0.fdr.1
- Version upgrade (0.7.1)

* Tue Dec 23 2003 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kino/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jul 2008 16:51:54 -0000	1.1
+++ .cvsignore	11 Aug 2008 10:32:27 -0000	1.2
@@ -0,0 +1 @@
+kino-1.3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/kino/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jul 2008 16:51:54 -0000	1.1
+++ sources	11 Aug 2008 10:32:27 -0000	1.2
@@ -0,0 +1 @@
+843af2668846dd03a6985ecaf12a9259  kino-1.3.0.tar.gz