Packman Build Service PMBS

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.

Changes of Revision 7

avidemux.changes Changed

avidemux.spec Changed

@@ -1,20 +1,38 @@
+#
+# spec file for package avidemux
+#
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# 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.opensuse.org/
+#
+
+
+%define		ffmpeg_version 0.9.3
 
 Name:		avidemux
 Version:	2.5.6
 Release:	9000.gop.1
 
 Summary:	Video processing tool
-URL:		http://fixounet.free.fr/avidemux/
-License:	GNU General Public License (GPL)
+Url:		http://fixounet.free.fr/avidemux/
+License:	GPL-2.0
 Group:		Productivity/Multimedia/Video/Editors and Convertors
 
 Source0:	avidemux_%{version}.tar.gz
 Source1:	%{name}.png
 Source2:	%{name}-gtk.desktop
 Source3:	%{name}-qt4.desktop
-
-Patch0:		%{name}-spelling_mistakes.patch
-Patch1:		%{name}_x264.patch
+Source4:	ffmpeg-%{ffmpeg_version}.tar.bz2
+Source5:	libavcodec_libavcodec.v.patch
 
 BuildRoot:	%{_tmppath}/buildroot-%{name}-%{version}
 
@@ -87,8 +105,13 @@
 
 %prep
 %setup -q -n "%{name}_%{version}"
-#%patch0 -p1
-#%patch1 -p1
+sed -i -e 's|set(FFMPEG_VERSION 0.9)|set(FFMPEG_VERSION %{ffmpeg_version})|g' cmake/admFFmpegBuild.cmake
+rm -f avidemux/ADM_libraries/ffmpeg-0.9.tar.bz2
+cp %{S:4} avidemux/ADM_libraries/
+pushd cmake/patches
+rm -f libavcodec_libavcodec.v.patch
+cp %{S:5} .
+popd
 
 
 %build
@@ -104,7 +127,6 @@
         -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         ..
 %__make
-# %{?jobs:-j%{jobs}}
 
 # symlinking all libraries to build the plugins
 %__mkdir_p lib
@@ -123,7 +145,6 @@
         -DAVIDEMUX_INSTALL_PREFIX=%{_builddir}/%{name}_%{version}/build \
         ..
 %__make
-# %{?jobs:-j%{jobs}}
 popd
 
 %install
@@ -165,7 +186,6 @@
 %{_libdir}/libADM_UICli.so
 %{_libdir}/libADM_render_cli.so
 %{_libdir}/libADM5avcodec.so.53
-#%{_libdir}/libADM5avcore.so.0
 %{_libdir}/libADM5avformat.so.53
 %{_libdir}/libADM5avutil.so.51
 %{_libdir}/libADM5postproc.so.51

avidemux-spelling_mistakes.patch Deleted

@@ -1,256 +0,0 @@
-Index: avidemux-2.5.4/addons/ffv1rec/ffv1audio.c
-===================================================================
---- avidemux-2.5.4.orig/addons/ffv1rec/ffv1audio.c	2010-11-04 20:28:31.647901001 +0100
-+++ avidemux-2.5.4/addons/ffv1rec/ffv1audio.c	2010-11-04 20:23:11.007901002 +0100
-@@ -200,7 +200,7 @@
-     act_audio_sample ++; // we should get this from the kernel
-                          // then we would know when we have lost audio FIXME TODO
- 
--    //usleep(10); // dont need to sleep (read is blocking)
-+    //usleep(10); // don't need to sleep (read is blocking)
-     // exit(0); // this stupid process doesn't die!!!!!!!!!!!!!!!!!!!
-   }
- }
-Index: avidemux-2.5.4/avidemux/ADM_inputs/ADM_matroska/ADM_mkvEntries.cpp
-===================================================================
---- avidemux-2.5.4.orig/avidemux/ADM_inputs/ADM_matroska/ADM_mkvEntries.cpp	2010-11-04 20:28:32.507901001 +0100
-+++ avidemux-2.5.4/avidemux/ADM_inputs/ADM_matroska/ADM_mkvEntries.cpp	2010-11-04 20:20:36.997901003 +0100
-@@ -83,7 +83,7 @@
-           PRINT(bpp);
-           break;
-         default:
--          printf("Unkown track type (%d)\n",trackType);
-+          printf("Unknown track type (%d)\n",trackType);
-       }
- }
- 
-Index: avidemux-2.5.4/avidemux/ADM_inputs/ADM_matroska/ADM_mkvIndexer.cpp
-===================================================================
---- avidemux-2.5.4.orig/avidemux/ADM_inputs/ADM_matroska/ADM_mkvIndexer.cpp	2010-11-04 20:28:32.417901001 +0100
-+++ avidemux-2.5.4/avidemux/ADM_inputs/ADM_matroska/ADM_mkvIndexer.cpp	2010-11-04 20:23:34.107901003 +0100
-@@ -137,7 +137,7 @@
-   int track=searchTrackFromTid(tid);
- 
-       //printf("Wanted %u got %u\n",_tracks[0].streamIndex,tid);
--      if(track==-1) //dont care track
-+      if(track==-1) //don't care track
-       {
- 
-         parser->seek(tail);
-Index: avidemux-2.5.4/avidemux/ADM_inputs/ADM_matroska/ADM_mkvTrackType.cpp
-===================================================================
---- avidemux-2.5.4.orig/avidemux/ADM_inputs/ADM_matroska/ADM_mkvTrackType.cpp	2010-11-04 20:28:32.467901001 +0100
-+++ avidemux-2.5.4/avidemux/ADM_inputs/ADM_matroska/ADM_mkvTrackType.cpp	2010-11-04 20:22:18.777900999 +0100
-@@ -77,7 +77,7 @@
-                else return cur->audioCC;
-       }
-     }
--    printf("[MKV] Warning type <%s> unkown!!\n",codec);
-+    printf("[MKV] Warning type <%s> unknown!!\n",codec);
-     return 0;
- }
-   //EOF
-Index: avidemux-2.5.4/avidemux/ADM_inputs/ADM_mpegdemuxer/ADM_tsGetBits.cpp
-===================================================================
---- avidemux-2.5.4.orig/avidemux/ADM_inputs/ADM_mpegdemuxer/ADM_tsGetBits.cpp	2010-11-04 20:28:32.747901001 +0100
-+++ avidemux-2.5.4/avidemux/ADM_inputs/ADM_mpegdemuxer/ADM_tsGetBits.cpp	2010-11-04 20:25:04.807901000 +0100
-@@ -3,7 +3,7 @@
-     \brief Simple getbits dedicated to TS packet. should be made more generic.
-     \author mean (C) 2010 fixounet@free.fr
- 
--    This is slow, but we dont care as it is not used much.
-+    This is slow, but we don't care as it is not used much.
-     The aim is to consume exactly what we need from the pkt.
- 
-  ***************************************************************************/
-Index: avidemux-2.5.4/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_demuxerPS.cpp
-===================================================================
---- avidemux-2.5.4.orig/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_demuxerPS.cpp	2010-11-04 20:28:32.587901001 +0100
-+++ avidemux-2.5.4/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_demuxerPS.cpp	2010-11-04 20:21:15.187901001 +0100
-@@ -656,7 +656,7 @@
-                                                 break;
-                              
-                                 default:
--                                                printf("Unkown substream %x\n",*substream);
-+                                                printf("Unknown substream %x\n",*substream);
-                                                 *substream=0xff;
-                                 }
-                                 // skip audio header (if not sub)
-Index: avidemux-2.5.4/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
-===================================================================
---- avidemux-2.5.4.orig/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp	2010-11-04 20:28:32.687901001 +0100
-+++ avidemux-2.5.4/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp	2010-11-04 20:24:31.727901002 +0100
-@@ -101,7 +101,7 @@
-         if(decimals>4) decimals=4;
-         if(*multi==FP_DONT_APPEND)
-         {
--                if(decimals) printf("There was several files, but dont append was forced\n");
-+                if(decimals) printf("There was several files, but don't append was forced\n");
-                 decimals=0;
-         }
-         // no number sequence
-Index: avidemux-2.5.4/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_probeTS.cpp
-===================================================================
---- avidemux-2.5.4.orig/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_probeTS.cpp	2010-11-04 20:28:32.627901001 +0100
-+++ avidemux-2.5.4/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_probeTS.cpp	2010-11-04 20:21:42.507901002 +0100
-@@ -556,50 +556,50 @@
- 	return 1;
- }
- 
--int parseProgramDescriptors(uint8_t *progDescBuffer, int progDescLength, int *esType)
--{
--	int i, descLen, len;
--
--	i = 0;
--	len = progDescLength;
--
--	while (len > 2)
--	{
--		descLen = progDescBuffer[i + 1];
--		aprintf("[TS]\tdescriptor id: 0x%x, len = %d (bytes left: %d)\n", progDescBuffer[i], descLen, len);
--
--		if (descLen > len)
--		{
--			printf("[TS] Invalid descriptor length for id %02x: %d (bytes left: %d)\n", progDescBuffer[i], descLen, len);
--			return 0;
--		}
--
--		if ((progDescBuffer[i] == 0x6a || progDescBuffer[i] == 0x7a) && *esType == 0x6)	// AC3
--			*esType = 0x81;
--		//else if (progDescBuffer[i] == 0x7b && *esType == 0x6)	// DTS
--		else if (progDescBuffer[i] == 0x5)
--		{
--			if (descLen < 4)
--				printf("[TS] Registration descriptor too short: %d\n", descLen);
--			else
--			{
--				uint8_t *d = &progDescBuffer[i + 2];
--
--				if (d[0] == 'A' && d[1] == 'C' && d[2] == '-' && d[3] == '3')	// AC3
-+int parseProgramDescriptors(uint8_t *progDescBuffer, int progDescLength, int *esType)
-+{
-+	int i, descLen, len;
-+
-+	i = 0;
-+	len = progDescLength;
-+
-+	while (len > 2)
-+	{
-+		descLen = progDescBuffer[i + 1];
-+		aprintf("[TS]\tdescriptor id: 0x%x, len = %d (bytes left: %d)\n", progDescBuffer[i], descLen, len);
-+
-+		if (descLen > len)
-+		{
-+			printf("[TS] Invalid descriptor length for id %02x: %d (bytes left: %d)\n", progDescBuffer[i], descLen, len);
-+			return 0;
-+		}
-+
-+		if ((progDescBuffer[i] == 0x6a || progDescBuffer[i] == 0x7a) && *esType == 0x6)	// AC3
-+			*esType = 0x81;
-+		//else if (progDescBuffer[i] == 0x7b && *esType == 0x6)	// DTS
-+		else if (progDescBuffer[i] == 0x5)
-+		{
-+			if (descLen < 4)
-+				printf("[TS] Registration descriptor too short: %d\n", descLen);
-+			else
-+			{
-+				uint8_t *d = &progDescBuffer[i + 2];
-+
-+				if (d[0] == 'A' && d[1] == 'C' && d[2] == '-' && d[3] == '3')	// AC3
- 					*esType = 0x81;
-                 else if (d[0] == 'V' && d[1] == 'C' && d[2] == '-' && d[3] == '1')	
-                             *esType = 0xea;
--                    else printf("Unkown registration : %c%c%c%c\n",d[0],d[1],d[2],d[3]);
--				//else if (d[0] == 'D' && d[1] == 'T' && d[2] == 'S' && d[3] == '1')	// DTS
--				//else if (d[0] == 'D' && d[1] == 'T' && d[2] == 'S' && d[3] == '2')	// DTS
--				//else if (d[0] == 'V' && d[1] == 'C' && d[2] == '-' && d[3] == '1')	// VC-1
--			}
--		}
--
--		len -= 2 + descLen;
--		i += 2 + descLen;
--	}
--
-+                    else printf("Unknown registration : %c%c%c%c\n",d[0],d[1],d[2],d[3]);
-+				//else if (d[0] == 'D' && d[1] == 'T' && d[2] == 'S' && d[3] == '1')	// DTS
-+				//else if (d[0] == 'D' && d[1] == 'T' && d[2] == 'S' && d[3] == '2')	// DTS
-+				//else if (d[0] == 'V' && d[1] == 'C' && d[2] == '-' && d[3] == '1')	// VC-1
-+			}
-+		}
-+
-+		len -= 2 + descLen;
-+		i += 2 + descLen;
-+	}
-+
- 	return 1;
- }
- 
-Index: avidemux-2.5.4/avidemux/ADM_inputs/ADM_openDML/ADM_openDMLDepack.cpp
-===================================================================
---- avidemux-2.5.4.orig/avidemux/ADM_inputs/ADM_openDML/ADM_openDMLDepack.cpp	2010-11-04 20:28:32.817901001 +0100
-+++ avidemux-2.5.4/avidemux/ADM_inputs/ADM_openDML/ADM_openDMLDepack.cpp	2010-11-04 20:27:36.477900998 +0100
-@@ -190,7 +190,7 @@
- #endif	
- 	if(ret==1)
- 	{
--		printf("Sucessfully unpacked the bitstream\n");
-+		printf("Successfully unpacked the bitstream\n");
- 		
- 		delete [] _idx;

avidemux_x264.patch Deleted

@@ -1,45 +0,0 @@
-diff -ur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
---- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2010-10-03 18:54:51.000000000 +0200
-+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-09-10 00:03:17.776091307 +0200
-@@ -488,8 +488,10 @@
- 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
- 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
- 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
-+#elif X264_BUILD > 114
-+	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
- #endif
- 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
- #if X264_BUILD > 88
-diff -ur avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.5.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2010-12-31 22:23:09.000000000 +0100
-+++ avidemux_2.5.5/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-09-10 00:05:24.198844428 +0200
-@@ -417,7 +417,7 @@
- 	_param.b_cabac = cabac;
- }
- 
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- unsigned int x264Options::getOpenGopMode(void)
- {
- 	return _param.i_open_gop;
-@@ -428,6 +428,17 @@
- 	if (openGopMode < 3)
- 		_param.i_open_gop = openGopMode;
- }
-+#elif X264_BUILD > 114                                                                                                                                      
-+unsigned int x264Options::getOpenGopMode(void)                                                                                                              
-+{                                                                                                                                                           
-+	return _param.b_open_gop;
-+}
-+ 
-+void x264Options::setOpenGopMode(unsigned int openGopMode)
-+{
-+	if (openGopMode < 3)
-+		_param.b_open_gop = openGopMode;
-+}
- #endif
- 
- unsigned int x264Options::getInterlaced(void)

libavcodec_libavcodec.v.patch Added

avidemux-gtk.desktop Changed

avidemux-qt4.desktop Changed

ffmpeg-0.9.3.tar.bz2 Added