Request 3223 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

You're not reviewing the full diff of request 3223 , but the diff to the superseded request 3195 (Show full diff)

Overview

Request 3223 (accepted)

Update and fix (2nd attempt)

Created by Aloysius almost 8 years ago
In state accepted
Package maintainer: pbleser
Supersedes 3195

Submit oggvideotools

Submit package home:Aloysiu...s:Multimedia / oggvideotools to package Multimedia / oggvideotools

oggvideotools.changes Changed

@@ -1,48 +1,4 @@
 -------------------------------------------------------------------
-Fri Jan  6 11:44:09 UTC 2017 - aloisio@gmx.com
-
-- Update to 0.9.1
-  * changed over to C++11 and boost (in some minor places).
-  * Cleanup a lot of things to fit ogg/theora/vorbis API again.
-  Version 0.9:
-  * Bug in oggRingbuffer fixed (Thanks to Bjarne) -> solved 
-    problems with ffmpeg ogg implementation
-  * Manpage cleanup
-  * fix for gcc 4.7 (used in Fedora 17)
-  Version 0.8a:
-  * Handling of zero size packets
-  * correct compiling of small packets into pages (packaging 
-    exactly 255 segments per page)
-  * renaming oggResize to oggTranscode
-  * oggCat can handle different video and audio files 
-    (complete rewrite)
-  * internal: video and audio hook for oggCat and oggTranscode
-  * timing, stream No. and stream type in oggDump packet dump 
-    output
-  * reworked manpages
-  * switch to cmake
-  * oggScroll is no longer supported (libSDL is not needed any 
-    more!) and will not be installed
-  * mkSlideshow is not supported any more and will not be 
-    installed
-  * cleanup mkThumb (bug #2925128) - thanks to jferlito
-  * integrated fixes from Tim Starling (advanced exception 
-    handling, logging etc)
-  * oggSlideshow returns with -1 if no picture was found
-  * prefix walkthrough for KenBurns effect
-  * Documentation pdf is outdated and therefir not shiped with 
-    the source package any more google can help much better
-  * release creation reworked
-  * configure reworked and added to trunk
-    
-- Dropped oggvideotools-gcc47-includes.patch and
-  oggvideotools-fix_nonvoid_return.patch no longer necessary
-
-- Added oggvideotools-paths.patch and oggvideotools-gcc6.patch
-
-- Spec cleanup
-
--------------------------------------------------------------------
 Sat May 19 11:57:58 UTC 2012 - seife+obs@b1-systems.com
 
 - fix build with gcc 4.7 (add missing includes)

oggvideotools.spec Changed

@@ -1,45 +1,20 @@
-#
-# spec file for package oggvideotools
-#
-# Copyright (c) 2017 Packman Team <packman@links2linux.de>
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.links2linux.org/
-#
-
+# vim: set ts=4 sw=4 et:
 
 Name:           oggvideotools
-Version:        0.9.1
-Release:        0
+Version:        0.8
+Release:        0.pm.1
 Summary:        Toolbox for manipulating Ogg Video Files
-License:        GPL-2.0
+# http://prdownloads.sourceforge.net/oggvideotools/oggvideotools-%{version}.tar.gz
+Source:         oggvideotools-%{version}.tar.bz2
+Patch1:         oggvideotools-fix_nonvoid_return.patch
+Patch2:         oggvideotools-gcc47-includes.patch
+URL:            http://dev.streamnik.de/oggvideotools.html
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Url:            http://dev.streamnik.de/oggvideotools.html
-Source:         http://prdownloads.sourceforge.net/oggvideotools/oggvideotools-%{version}.tar.bz2
-Patch2:         oggvideotools-paths.patch
-Patch3:         oggvideotools-gcc6.patch
-BuildRequires:  SDL-devel
-BuildRequires:  boost-devel
-BuildRequires:  cmake
-BuildRequires:  gcc-c++
-BuildRequires:  gd-devel
-BuildRequires:  glibc-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libstdc++-devel
-BuildRequires:  libtheora-devel
-BuildRequires:  libtool
-BuildRequires:  libvorbis-devel
-BuildRequires:  make
-BuildRequires:  pkgconfig
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+License:        GNU General Public License version 2 (GPL v2)
+BuildRoot:      %{_tmppath}/build-%{name}-%{version}
+BuildRequires:  libogg-devel libvorbis-devel libtheora-devel SDL-devel gd-devel
+BuildRequires:  gcc-c++ libstdc++-devel make glibc-devel pkgconfig
+BuildRequires:  autoconf automake libtool
 
 %description
 The "Ogg Video Tools" is a toolbox for manipulating Ogg video files, which
@@ -49,28 +24,22 @@
 
 %prep
 %setup -q
+%patch1
 %patch2 -p1
-%if 0%{?suse_version} > 1320
-%patch3 -p1
-%endif
 
 %build
-pushd build
-cmake \
-   -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-   ..
-make %{?_smp_mflags}
-popd
+%configure
+%__make %{?_smp_flags}
 
 %install
-pushd build
-make DESTDIR=%{buildroot} install
-popd
-chmod +x %{buildroot}%{_bindir}/mkSlideshow %{buildroot}%{_bindir}/mkThumbs
+%makeinstall
+
+%clean
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/mkSlideshow
 %{_bindir}/mkThumbs
 %{_bindir}/oggCat
@@ -78,12 +47,12 @@
 %{_bindir}/oggDump
 %{_bindir}/oggJoin
 %{_bindir}/oggLength
+%{_bindir}/oggScroll
 %{_bindir}/oggSilence
 %{_bindir}/oggSlideshow
 %{_bindir}/oggSplit
+%{_bindir}/oggResize
 %{_bindir}/oggThumb
-%{_bindir}/oggTranscode
-%{_mandir}/man1/mkThumbs.1%{ext_man}
 %{_mandir}/man1/ogg*.1%{ext_man}
 
 %changelog

oggvideotools-fix_nonvoid_return.patch Added

oggvideotools-gcc47-includes.patch Added

@@ -0,0 +1,128 @@
+Index: b/src/oggDump.cpp
+===================================================================
+--- a/src/oggDump.cpp
++++ b/src/oggDump.cpp
+@@ -29,10 +29,11 @@
+ #include <vector>
+ #include <sstream>
+ #include <fstream>
+ #include <ostream>
+ #include <cstdlib>
++#include <unistd.h>
+ 
+ #include "fileRepository.h"
+ #include "rawMediaPacket.h"
+ #include "oggDecoder.h"
+ #include "oggEncoder.h"
+Index: b/src/oggCut.cpp
+===================================================================
+--- a/src/oggCut.cpp
++++ b/src/oggCut.cpp
+@@ -27,10 +27,11 @@
+ #include <iostream>
+ #include <sstream>
+ #include <map>
+ #include <cstdlib>
+ #include <ctime>
++#include <unistd.h>
+ 
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+ #include "streamMux.h"
+ #include "oggEncoder.h"
+Index: b/src/oggLength.cpp
+===================================================================
+--- a/src/oggLength.cpp
++++ b/src/oggLength.cpp
+@@ -25,10 +25,11 @@
+ #endif
+ 
+ #include <iostream>
+ #include <string>
+ #include <cstdlib>
++#include <unistd.h>
+ 
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+ 
+ void printHelpScreen(std::string& progName)
+Index: b/src/oggScroll.cpp
+===================================================================
+--- a/src/oggScroll.cpp
++++ b/src/oggScroll.cpp
+@@ -20,10 +20,11 @@
+  */
+ 
+ #include <iostream>
+ #include <map>
+ #include <termios.h>
++#include <unistd.h>
+ #include <SDL/SDL.h>
+ 
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+ #include "theoraDecoder.h"
+Index: b/src/oggSlideshow.cpp
+===================================================================
+--- a/src/oggSlideshow.cpp
++++ b/src/oggSlideshow.cpp
+@@ -31,10 +31,11 @@
+ #include <sstream>
+ #include <cstdlib>
+ #include <cmath>
+ #include <cstring>
+ #include <ctime>
++#include <unistd.h>
+ //#include <cc++/slog.h>
+ 
+ #include "th_helper.h"
+ 
+ #include "definition.h"
+Index: b/src/oggSilence.cpp
+===================================================================
+--- a/src/oggSilence.cpp
++++ b/src/oggSilence.cpp
+@@ -28,10 +28,11 @@
+ #include <vector>
+ #include <iostream>
+ #include <sstream>
+ #include <cstdlib>
+ #include <ctime>
++#include <unistd.h>
+ 
+ #include "vorbisEncoder.h"
+ #include "streamMux.h"
+ #include "fileRepository.h"
+ #include "oggComment.h"
+Index: b/src/oggThumb.cpp
+===================================================================
+--- a/src/oggThumb.cpp
++++ b/src/oggThumb.cpp
+@@ -30,10 +30,11 @@
+ #include <sstream>
+ #include <string>
+ #include <iostream>
+ #include <cstdlib>
+ #include <queue>
++#include <unistd.h>
+ 
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+ #include "theoraDecoder.h"
+ #include "theoraStreamParameter.h"
+Index: b/src/oggResize.cpp
+===================================================================
+--- a/src/oggResize.cpp
++++ b/src/oggResize.cpp
+@@ -32,10 +32,11 @@
+ 
+ #include <cstring>
+ #include <cstdlib>
+ #include <cmath>
+ #include <ctime>
++#include <unistd.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+

oggvideotools-gcc6.patch Deleted

oggvideotools-paths.patch Deleted

oggvideotools-0.9.1.tar.bz2 -> oggvideotools-0.8.tar.bz2 Changed

Build Results
RPM Lint

Refresh

Comments for request 3223 0
Comments for request 3195 1

olh wrote almost 8 years ago

Why is the patch applied conditional?

Request History

Aloysius created request almost 8 years ago

Update and fix (2nd attempt)

olh accepted request almost 8 years ago