SF.net SVN: gar:[22385] csw/mgar/pkg
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Mon Nov 4 18:08:32 CET 2013
Revision: 22385
http://gar.svn.sourceforge.net/gar/?rev=22385&view=rev
Author: pfelecan
Date: 2013-11-04 17:08:32 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
avidemux/trunk: instatiation
Added Paths:
-----------
csw/mgar/pkg/avidemux/
csw/mgar/pkg/avidemux/Makefile
csw/mgar/pkg/avidemux/branches/
csw/mgar/pkg/avidemux/tags/
csw/mgar/pkg/avidemux/trunk/
csw/mgar/pkg/avidemux/trunk/Makefile
csw/mgar/pkg/avidemux/trunk/checksums
csw/mgar/pkg/avidemux/trunk/files/
csw/mgar/pkg/avidemux/trunk/files/0001-sh-is-not-bash.patch
csw/mgar/pkg/avidemux/trunk/files/0002-cmake-verbosity-management.patch
csw/mgar/pkg/avidemux/trunk/files/0003-use-not-as-needed-linker-option.patch
csw/mgar/pkg/avidemux/trunk/files/0004-fix-processors-cardinality-gathering.patch
csw/mgar/pkg/avidemux/trunk/files/0005-make-crashdump-NOP.patch
csw/mgar/pkg/avidemux/trunk/files/0006-abs-desabiguation.patch
csw/mgar/pkg/avidemux/trunk/files/0007-abs-desabiguation-2.patch
csw/mgar/pkg/avidemux/trunk/files/0008-fix-text-relocation-remains-referenced.patch
csw/mgar/pkg/avidemux/trunk/files/0009-setting-release-build.patch
csw/mgar/pkg/avidemux/trunk/files/0010-fabs-desambiguation.patch
csw/mgar/pkg/avidemux/trunk/files/0011-POW10-definition.patch
csw/mgar/pkg/avidemux/trunk/files/0012-abs-desabiguation-3.patch
csw/mgar/pkg/avidemux/trunk/files/0013-include-alloca-declaration.patch
csw/mgar/pkg/avidemux/trunk/files/0014-fix-text-relocation-remains-referenced-2.patch
csw/mgar/pkg/avidemux/trunk/files/0015-avoid-empty-library.patch
csw/mgar/pkg/avidemux/trunk/files/0016-avoid-multiple-register-definition.patch
csw/mgar/pkg/avidemux/trunk/files/0017-abs-desabiguation-4.patch
csw/mgar/pkg/avidemux/trunk/files/0018-floor-desabiguation.patch
csw/mgar/pkg/avidemux/trunk/files/0019-fix-linker-script-option.patch
csw/mgar/pkg/avidemux/trunk/files/0020-fabs-desambiguation-2.patch
csw/mgar/pkg/avidemux/trunk/files/0021-fix-text-relocation-remains-referenced-3.patch
csw/mgar/pkg/avidemux/trunk/files/0022-abs-desabiguation-5.patch
csw/mgar/pkg/avidemux/trunk/files/0023-fix-font-reference.patch
Added: csw/mgar/pkg/avidemux/Makefile
===================================================================
--- csw/mgar/pkg/avidemux/Makefile (rev 0)
+++ csw/mgar/pkg/avidemux/Makefile 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Property changes on: csw/mgar/pkg/avidemux/trunk
___________________________________________________________________
Added: svn:ignore
+ work
Added: csw/mgar/pkg/avidemux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/avidemux/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/Makefile 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,396 @@
+# $Id$
+
+NAME = avidemux
+VERSION = 2.6.6
+GARTYPE = v2
+
+DESCRIPTION = Video editor designed for simple cutting, filtering and encoding tasks.
+define BLURB
+ Avidemux is a free video editor designed for simple cutting,
+ filtering and encoding tasks. It supports many file types, including
+ AVI, DVD compatible MPEG files, MP4 and ASF, using a variety of
+ codecs. Tasks can be automated using projects, job queue and
+ powerful scripting capabilities.
+endef
+
+VENDOR_URL = http://fixounet.free.fr/avidemux/index.html
+MASTER_SITES = $(SF_MIRRORS)
+DISTNAME = $(NAME)_$(VERSION)
+DISTFILES = $(DISTNAME).tar.gz
+PATCHFILES += 0001-sh-is-not-bash.patch
+PATCHFILES += 0002-cmake-verbosity-management.patch
+PATCHFILES += 0003-use-not-as-needed-linker-option.patch
+PATCHFILES += 0004-fix-processors-cardinality-gathering.patch
+PATCHFILES += 0005-make-crashdump-NOP.patch
+PATCHFILES += 0006-abs-desabiguation.patch
+PATCHFILES += 0007-abs-desabiguation-2.patch
+PATCHFILES += 0008-fix-text-relocation-remains-referenced.patch
+PATCHFILES += 0009-setting-release-build.patch
+PATCHFILES += 0010-fabs-desambiguation.patch
+PATCHFILES += 0011-POW10-definition.patch
+PATCHFILES += 0012-abs-desabiguation-3.patch
+PATCHFILES += 0013-include-alloca-declaration.patch
+PATCHFILES += 0014-fix-text-relocation-remains-referenced-2.patch
+PATCHFILES += 0015-avoid-empty-library.patch
+PATCHFILES += 0016-avoid-multiple-register-definition.patch
+PATCHFILES += 0017-abs-desabiguation-4.patch
+PATCHFILES += 0018-floor-desabiguation.patch
+PATCHFILES += 0019-fix-linker-script-option.patch
+PATCHFILES += 0020-fabs-desambiguation-2.patch
+PATCHFILES += 0021-fix-text-relocation-remains-referenced-3.patch
+PATCHFILES += 0022-abs-desabiguation-5.patch
+PATCHFILES += 0023-fix-font-reference.patch
+
+BUILD_DEP_PKGS += CSWcmake
+BUILD_DEP_PKGS += CSWgpatch
+
+GARCOMPILER = GNU
+CONFIGURE_ARGS = $(DIRPATHS)
+EXTRA_CFLAGS = -fPIC -I /usr/X11/include
+EXTRA_CXXFLAGS = -fPIC -I /usr/X11/include
+EXTRA_LDFLAGS = -lsocket -lnsl -lxnet -R$(libdir)
+
+CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
+CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
+CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)"
+CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"
+CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
+CMAKE_ARGS += -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
+CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=$(libdir)
+CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
+CMAKE_ARGS += -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS += -DCMAKE_EDIT_COMMAND=vim
+
+CONFIGURE_SCRIPTS = custom
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibqtopengl4
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibqtscripttools4
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibfribidi0
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibmp3lame0
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibfaad2
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibx264-133
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWavidemux += CSWfaac
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibz1
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibvorbis0
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibesd0
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibvorbisenc2
+RUNTIME_DEP_PKGS_CSWavidemux += CSWmesa
+RUNTIME_DEP_PKGS_CSWavidemux += CSWlibgcc-s1
+
+include gar/category.mk
+
+PATH := /opt/csw/gnu:$(PATH)
+
+# these targets are an adaptation of the bootStrap.sh provided by
+# the project; beside the byzantine content of the script, this
+# adaptation makes it easier to adapt to gar.
+
+
+TOP = $(PWD)/$(WORKSRC)
+FAKEROOT_DIR = $(PWD)/$(WORKSRC)/install
+BUILDER = Unix Makefiles
+CMAKE_ARGS += -DFAKEROOT=$(FAKEROOT_DIR)
+CMAKE_ARGS += -DAVIDEMUX_SOURCE_DIR=$(TOP)
+#CMAKE_ARGS += --trace
+
+ADM = $(COOKIEROOTDIR)/$(MODULATION)/
+
+# configuration is also build...
+configure-custom: \
+ $(ADM)core \
+ $(ADM)qt4 \
+ $(ADM)cli \
+ $(ADM)plugins
+ @$(MAKECOOKIE)
+
+define configureRule =
+ $(info configure rule for '$(1)')
+ cd $(WORKSRC) && rm -rf $(BUILDDIR) && \
+ mkdir -p $(BUILDDIR)
+ cd $(WORKSRC)/$(BUILDDIR) && \
+ /usr/bin/env -i \
+ $(CONFIGURE_ENV) \
+ cmake \
+ $(CMAKE_ARGS) \
+ -G "$(BUILDER)" \
+ $(1)
+ : $@ done
+endef
+
+define buildRule =
+ cd $(WORKSRC)/$(BUILDDIR) && \
+ /usr/bin/env -i \
+ $(CONFIGURE_ENV) \
+ $(MAKE)
+ : $@ done
+endef
+
+define installRule =
+ cd $(WORKSRC)/$(BUILDDIR) && \
+ /usr/bin/env -i \
+ $(CONFIGURE_ENV) \
+ $(MAKE) install DESTDIR=$(FAKEROOT_DIR)
+ : $@ done
+endef
+
+coreBuildDirectory = buildCore
+
+$(ADM)core: BUILDDIR = $(coreBuildDirectory)
+$(ADM)core: \
+ $(ADM)fake-configure-core \
+ $(ADM)fake-build-core \
+ $(ADM)fake-install-core
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-configure-core: BUILDDIR = $(coreBuildDirectory)
+$(ADM)fake-configure-core:
+ $(call configureRule,../avidemux_core)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-build-core: BUILDDIR = $(coreBuildDirectory)
+$(ADM)fake-build-core:
+ gsed --in-place --regexp-extended --expression 's;^#![[:space:]]*/bin/sh[[:space:]]*;#!/usr/bin/env bash;' $(WORKSRC)/$(BUILDDIR)/ffmpeg/source/version.sh
+ gsed --in-place --regexp-extended --expression 's;-Wl,-rpath-link=.*$$;;' $(WORKSRC)/$(BUILDDIR)/ffmpeg/build/config.mak
+ $(buildRule)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-install-core: BUILDDIR = $(coreBuildDirectory)
+$(ADM)fake-install-core:
+ $(installRule)
+ @$(MAKECOOKIE)
+
+qt4BuildDirectory = buildQt4
+
+$(ADM)qt4: BUILDDIR = $(qt4BuildDirectory)
+$(ADM)qt4: \
+ $(ADM)fake-configure-qt4 \
+ $(ADM)fake-build-qt4 \
+ $(ADM)fake-install-qt4
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-configure-qt4: BUILDDIR = $(qt4BuildDirectory)
+$(ADM)fake-configure-qt4:
+ $(call configureRule,../avidemux/qt4)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-build-qt4: BUILDDIR = $(qt4BuildDirectory)
+$(ADM)fake-build-qt4:
+ $(buildRule)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-install-qt4: BUILDDIR = $(qt4BuildDirectory)
+$(ADM)fake-install-qt4:
+ $(installRule)
+ @$(MAKECOOKIE)
+
+cliBuildDirectory = buildCli
+
+$(ADM)cli: BUILDDIR = $(cliBuildDirectory)
+$(ADM)cli: \
+ $(ADM)fake-configure-cli \
+ $(ADM)fake-build-cli \
+ $(ADM)fake-install-cli
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-configure-cli: BUILDDIR = $(cliBuildDirectory)
+$(ADM)fake-configure-cli:
+ $(call configureRule,../avidemux/cli)
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-build-cli: BUILDDIR = $(cliBuildDirectory)
+$(ADM)fake-build-cli:
+ $(buildRule)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-install-cli: BUILDDIR = $(cliBuildDirectory)
+$(ADM)fake-install-cli:
+ $(installRule)
+ @$(MAKECOOKIE)
+
+# requires GTK 3 which is not available in our offering
+gtkBuildDirectory = buildGtk
+
+$(ADM)gtk: BUILDDIR = $(gtkBuildDirectory)
+$(ADM)gtk: \
+ $(ADM)fake-configure-gtk \
+ $(ADM)fake-build-gtk \
+ $(ADM)fake-install-gtk
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-configure-gtk: BUILDDIR = $(gtkBuildDirectory)
+$(ADM)fake-configure-gtk:
+ $(call configureRule,../avidemux/gtk)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-build-gtk: BUILDDIR = $(gtkBuildDirectory)
+$(ADM)fake-build-gtk:
+ $(buildRule)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-install-gtk: BUILDDIR = $(gtkBuildDirectory)
+$(ADM)fake-install-gtk:
+ $(installRule)
+ @$(MAKECOOKIE)
+
+$(ADM)plugins: \
+ $(ADM)plugin-common \
+ $(ADM)plugin-qt4 \
+ $(ADM)plugin-cli \
+ $(ADM)plugin-settings
+ : $@ done
+ @$(MAKECOOKIE)
+
+plugin-commonBuildDirectory = buildPluginsCommon
+
+$(ADM)plugin-common: BUILDDIR = $(plugin-commonBuildDirectory)
+$(ADM)plugin-common: \
+ $(ADM)fake-configure-plugin-common \
+ $(ADM)fake-build-plugin-common \
+ $(ADM)fake-install-plugin-common
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-configure-plugin-common: BUILDDIR = $(plugin-commonBuildDirectory)
+$(ADM)fake-configure-plugin-common: CMAKE_ARGS += -DPLUGIN_UI=COMMON
+$(ADM)fake-configure-plugin-common:
+ $(call configureRule,../avidemux_plugins)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-build-plugin-common: BUILDDIR = $(plugin-commonBuildDirectory)
+$(ADM)fake-build-plugin-common:
+ $(buildRule)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-install-plugin-common: BUILDDIR = $(plugin-commonBuildDirectory)
+$(ADM)fake-install-plugin-common:
+ $(installRule)
+ @$(MAKECOOKIE)
+
+plugin-qt4BuildDirectory = buildPluginsQt4
+
+$(ADM)plugin-qt4: BUILDDIR = $(plugin-qt4BuildDirectory)
+$(ADM)plugin-qt4: \
+ $(ADM)fake-configure-plugin-qt4 \
+ $(ADM)fake-build-plugin-qt4 \
+ $(ADM)fake-install-plugin-qt4
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-configure-plugin-qt4: BUILDDIR = $(plugin-qt4BuildDirectory)
+$(ADM)fake-configure-plugin-qt4: CMAKE_ARGS += -DPLUGIN_UI=QT4
+$(ADM)fake-configure-plugin-qt4:
+ $(call configureRule,../avidemux_plugins)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-build-plugin-qt4: BUILDDIR = $(plugin-qt4BuildDirectory)
+$(ADM)fake-build-plugin-qt4:
+ $(buildRule)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-install-plugin-qt4: BUILDDIR = $(plugin-qt4BuildDirectory)
+$(ADM)fake-install-plugin-qt4:
+ $(installRule)
+ @$(MAKECOOKIE)
+
+# requires GTK 3 which is not available in our offering
+plugin-gtkBuildDirectory = buildPluginsGtk
+
+$(ADM)plugin-gtk: BUILDDIR = $(plugin-gtkBuildDirectory)
+$(ADM)plugin-gtk: \
+ $(ADM)fake-configure-plugin-gtk \
+ $(ADM)fake-build-plugin-gtk \
+ $(ADM)fake-install-plugin-gtk
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-configure-plugin-gtk: BUILDDIR = $(plugin-gtkBuildDirectory)
+$(ADM)fake-configure-plugin-gtk: CMAKE_ARGS += -DPLUGIN_UI=GTK
+$(ADM)fake-configure-plugin-gtk:
+ $(call configureRule,../avidemux_plugins)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-build-plugin-gtk: BUILDDIR = $(plugin-gtkBuildDirectory)
+$(ADM)fake-build-plugin-gtk:
+ $(buildRule)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-install-plugin-gtk: BUILDDIR = $(plugin-gtkBuildDirectory)
+$(ADM)fake-install-plugin-gtk:
+ $(installRule)
+ @$(MAKECOOKIE)
+
+plugin-cliBuildDirectory = buildPluginsCli
+
+$(ADM)plugin-cli: BUILDDIR = $(plugin-cliBuildDirectory)
+$(ADM)plugin-cli: \
+ $(ADM)fake-configure-plugin-cli \
+ $(ADM)fake-build-plugin-cli \
+ $(ADM)fake-install-plugin-cli
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-configure-plugin-cli: BUILDDIR = $(plugin-cliBuildDirectory)
+$(ADM)fake-configure-plugin-cli: CMAKE_ARGS += -DPLUGIN_UI=CLI
+$(ADM)fake-configure-plugin-cli:
+ $(call configureRule,../avidemux_plugins)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-build-plugin-cli: BUILDDIR = $(plugin-cliBuildDirectory)
+$(ADM)fake-build-plugin-cli:
+ $(buildRule)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-install-plugin-cli: BUILDDIR = $(plugin-cliBuildDirectory)
+$(ADM)fake-install-plugin-cli:
+ $(installRule)
+ @$(MAKECOOKIE)
+
+plugin-settingsBuildDirectory = buildPluginsSettings
+
+$(ADM)plugin-settings: BUILDDIR = $(plugin-settingsBuildDirectory)
+$(ADM)plugin-settings: \
+ $(ADM)fake-configure-plugin-settings \
+ $(ADM)fake-build-plugin-settings \
+ $(ADM)fake-install-plugin-settings
+ : $@ done
+ @$(MAKECOOKIE)
+
+$(ADM)fake-configure-plugin-settings: BUILDDIR = $(plugin-settingsBuildDirectory)
+$(ADM)fake-configure-plugin-settings: CMAKE_ARGS += -DPLUGIN_UI=SETTINGS
+$(ADM)fake-configure-plugin-settings:
+ $(call configureRule,../avidemux_plugins)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-build-plugin-settings: BUILDDIR = $(plugin-settingsBuildDirectory)
+$(ADM)fake-build-plugin-settings:
+ $(buildRule)
+ @$(MAKECOOKIE)
+
+$(ADM)fake-install-plugin-settings: BUILDDIR = $(plugin-settingsBuildDirectory)
+$(ADM)fake-install-plugin-settings:
+ $(installRule)
+ @$(MAKECOOKIE)
+
+install-custom:
+ ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)
+ gtar --directory=$(FAKEROOT_DIR) --create --file=- --exclude=opt/csw/include --exclude=opt/csw/share/ADM6_addons . | \
+ gtar --directory=$(DESTDIR) --extract --file=-
+ @$(MAKECOOKIE)
+
Property changes on: csw/mgar/pkg/avidemux/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/avidemux/trunk/checksums
===================================================================
--- csw/mgar/pkg/avidemux/trunk/checksums (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/checksums 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1 @@
+071e6a574e86681f96e5fce22f574b70 avidemux_2.6.6.tar.gz
Added: csw/mgar/pkg/avidemux/trunk/files/0001-sh-is-not-bash.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0001-sh-is-not-bash.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0001-sh-is-not-bash.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,25 @@
+From 07be5aab65c8bc11f66cb610feafe7bd57edc87e Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Sat, 26 Oct 2013 11:34:19 +0200
+Subject: [PATCH] sh is not bash
+
+---
+ cmake/FindBourne.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/FindBourne.cmake b/cmake/FindBourne.cmake
+index e0f469e..0977b87 100644
+--- a/cmake/FindBourne.cmake
++++ b/cmake/FindBourne.cmake
+@@ -3,7 +3,7 @@ if (NOT BASH_EXECUTABLE)
+ message(STATUS "*************************")
+
+ find_program(BASH_EXECUTABLE
+- sh
++ bash
+ ${BASH_DIR}
+ /bin
+ /usr/bin
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0002-cmake-verbosity-management.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0002-cmake-verbosity-management.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0002-cmake-verbosity-management.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,31 @@
+From 06506d707c5fb038dc2e1d085ca1a08cb3e8c629 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Sat, 26 Oct 2013 10:24:19 +0200
+Subject: [PATCH] cmake verbosity management
+
+---
+ cmake/admMainChecks.cmake | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/admMainChecks.cmake b/cmake/admMainChecks.cmake
+index c760cdc..9d17dd2 100644
+--- a/cmake/admMainChecks.cmake
++++ b/cmake/admMainChecks.cmake
+@@ -43,7 +43,13 @@ ENDIF (FRESH_BUILD)
+ ########################################
+ # Global options
+ ########################################
+-OPTION(VERBOSE "" OFF)
++IF (NOT CMAKE_VERBOSE_MAKEFILE)
++ OPTION(VERBOSE "" OFF)
++ENDIF (NOT CMAKE_VERBOSE_MAKEFILE)
++
++IF (CMAKE_VERBOSE_MAKEFILE)
++ OPTION(VERBOSE "" ON)
++ENDIF (CMAKE_VERBOSE_MAKEFILE)
+
+ IF (NOT CMAKE_BUILD_TYPE)
+ SET(CMAKE_BUILD_TYPE "Release")
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0003-use-not-as-needed-linker-option.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0003-use-not-as-needed-linker-option.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0003-use-not-as-needed-linker-option.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,26 @@
+From 0998c2e88d9818d54703c8dab569584899f3db97 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Mon, 28 Oct 2013 18:26:41 +0100
+Subject: [PATCH] use not as needed linker option
+
+---
+ cmake/admAsNeeded.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/admAsNeeded.cmake b/cmake/admAsNeeded.cmake
+index 80a2f21..53ada16 100644
+--- a/cmake/admAsNeeded.cmake
++++ b/cmake/admAsNeeded.cmake
+@@ -1,7 +1,7 @@
+ MACRO(AS_NEEDED name)
+- if (CMAKE_COMPILER_IS_GNUCC AND NOT APPLE)
++ if (CMAKE_COMPILER_IS_GNUCC AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+ TARGET_LINK_LIBRARIES( ${name} "-Wl,--as-needed")
+- endif (CMAKE_COMPILER_IS_GNUCC AND NOT APPLE)
++ endif (CMAKE_COMPILER_IS_GNUCC AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+ ENDMACRO(AS_NEEDED name)
+
+ MACRO(ADM_ADD_SHARED_LIBRARY name)
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0004-fix-processors-cardinality-gathering.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0004-fix-processors-cardinality-gathering.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0004-fix-processors-cardinality-gathering.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,25 @@
+From fb833f83d5c7208af82ca5d74272fac4a4b986c8 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Sun, 27 Oct 2013 16:23:40 +0100
+Subject: [PATCH] fix processors cardinality gathering
+
+---
+ avidemux_core/ADM_core/src/ADM_cpuCap.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/avidemux_core/ADM_core/src/ADM_cpuCap.cpp b/avidemux_core/ADM_core/src/ADM_cpuCap.cpp
+index 8ec2841..0aafcce 100644
+--- a/avidemux_core/ADM_core/src/ADM_cpuCap.cpp
++++ b/avidemux_core/ADM_core/src/ADM_cpuCap.cpp
+@@ -161,6 +161,8 @@ int ADM_cpu_num_processors(void)
+ np = 1;
+
+ return np;
++#elif defined(__sun__)
++ return sysconf( _SC_NPROCESSORS_ONLN );
+ #elif defined(__unix__) && !defined(__CYGWIN__)
+ unsigned int bit;
+ int np;
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0005-make-crashdump-NOP.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0005-make-crashdump-NOP.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0005-make-crashdump-NOP.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,44 @@
+From d7022be6a4b0de461934a3ae6bc1bd1fc6d10aba Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Sun, 27 Oct 2013 16:26:50 +0100
+Subject: [PATCH] make crashdump NOP
+
+---
+ avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp b/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp
+index 891325f..e81de25 100644
+--- a/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp
++++ b/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp
+@@ -21,7 +21,9 @@
+ #include <unistd.h>
+ #include <cxxabi.h>
+ #include <signal.h>
++#if !defined(__sun__)
+ #include <execinfo.h>
++#endif /* : !defined(__sun__) */
+
+ #include "ADM_default.h"
+
+@@ -65,6 +67,7 @@ void sig_segfault_handler(int signo)
+
+ void ADM_backTrack(const char *info,int lineno,const char *file)
+ {
++#if !defined(__sun__)
+ if(mysaveFunction)
+ mysaveFunction();
+
+@@ -111,5 +114,9 @@ void ADM_backTrack(const char *info,int lineno,const char *file)
+
+ exit(-1); // _exit(1) ???
+ #endif
++#else /* : !defined(__sun__) */
++ printf("crashed in %s at line %d\n", file, lineno);
++ printf("crash backtrace not implemented for SUN Solaris!\n");
++#endif /* : !defined(__sun__) */
+ }
+ //EOF
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0006-abs-desabiguation.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0006-abs-desabiguation.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0006-abs-desabiguation.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,25 @@
+From 8ad678c03ff39338b4f05baa247d553f4780623b Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Mon, 28 Oct 2013 16:45:57 +0100
+Subject: [PATCH] abs desabiguation
+
+---
+ avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp b/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
+index 62da626..c5079f8 100644
+--- a/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
++++ b/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp
+@@ -46,7 +46,7 @@ bool ADM_audioStreamBuffered::refill(void)
+ // By construction, the error should be minimal
+ if(newDts!=ADM_AUDIO_NO_DTS)
+ {
+- if( abs(newDts-lastDts)>ADM_MAX_SKEW)
++ if( abs(long(newDts-lastDts))>ADM_MAX_SKEW)
+ {
+ printf("[AudioStream] Warning skew in dts =%"PRId64", \n",(int64_t)newDts-(uint64_t)lastDts);
+ printf("[AudioStream] Warning skew lastDts=%s \n",ADM_us2plain(lastDts));
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0007-abs-desabiguation-2.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0007-abs-desabiguation-2.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0007-abs-desabiguation-2.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,25 @@
+From 71c0aaacc93081765d635a1067851e33f2213df1 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 29 Oct 2013 13:37:22 +0100
+Subject: [PATCH] abs desabiguation 2
+
+---
+ avidemux_core/ADM_coreMuxer/src/ADM_audioClock.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux_core/ADM_coreMuxer/src/ADM_audioClock.cpp b/avidemux_core/ADM_coreMuxer/src/ADM_audioClock.cpp
+index 0cb3b5f..251a5e8 100644
+--- a/avidemux_core/ADM_coreMuxer/src/ADM_audioClock.cpp
++++ b/avidemux_core/ADM_coreMuxer/src/ADM_audioClock.cpp
+@@ -50,7 +50,7 @@ bool audioClock::setTimeUs(uint64_t clk)
+ {
+ uint64_t curTime=getTimeUs();
+ int64_t delta=(int64_t)clk-(int64_t)curTime;
+- if(abs(delta)<2000) return true;
++ if(abs(long(delta))<2000) return true;
+ printf("[audioClock] Drift detected :%"PRIu64" vs %"PRIu64", delta=%"PRId64"\n",curTime,clk,delta);
+ _nbSamples=0;
+ _baseClock=clk;
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0008-fix-text-relocation-remains-referenced.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0008-fix-text-relocation-remains-referenced.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0008-fix-text-relocation-remains-referenced.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,116 @@
+From 8924be20b35e59a1244ec8c442281d3476cf89fd Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 29 Oct 2013 13:39:46 +0100
+Subject: [PATCH] fix text relocation remains referenced
+
+---
+ avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp | 30 ++++++++++++++--------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp b/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp
+index 33d3724..dc11a1a 100644
+--- a/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp
++++ b/avidemux_core/ADM_coreImage/src/ADM_imageUtils.cpp
+@@ -44,7 +44,7 @@ int a1,a2;
+
+ return 1;
+ }
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86)
+ static uint8_t tinyAverageMMX(uint8_t *dst, uint8_t *src1, uint8_t *src2,uint32_t l)
+ {
+ int delta;
+@@ -104,7 +104,7 @@ int a1,a2;
+ */
+ bool ADMImage::merge(ADMImage *src1,ADMImage *src2)
+ {
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86)
+ if(CpuCaps::hasMMX())
+ {
+ tinyAverageMMX(YPLANE(this),YPLANE(src1),YPLANE(src2),(_width*_height*3)>>1);
+@@ -144,7 +144,7 @@ static bool blendC(int width, int height,
+ }
+ return true;
+ }
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86)
+ static bool blendMMX(int width, int height,
+ uint8_t *target,uint32_t stride,
+ uint8_t *src1, uint32_t stride1,
+@@ -263,7 +263,7 @@ uint8_t *s1,*s2,*d1;
+ bool ADMImage::blend(ADMImage *src1,ADMImage *src2)
+ {
+ blendFunction *myBlend=blendC;
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86)
+ if(CpuCaps::hasMMX())
+ myBlend=blendMMX;
+ if(CpuCaps::hasSSE())
+@@ -305,7 +305,12 @@ uint32_t ww,hh;
+ }
+ return df;
+ }
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86) && !defined(__sun__)
++/*
++ On Solaris this raises the "relocations remain against allocatable
++ but non-writable sections" linker error at:
++ .bss (section) 0x3bb
++ */
+ static uint64_t __attribute__((used)) FUNNY_MANGLE(noise64);
+ static uint32_t computeDiffMMX(uint8_t *s1,uint8_t *s2,uint32_t noise,uint32_t l)
+ {
+@@ -395,7 +400,7 @@ uint32_t result=0;
+ uint32_t ADMImage::lumaDiff(ADMImage *src1,ADMImage *src2,uint32_t noise)
+ {
+
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86) && !defined(__sun__)
+ uint32_t r1,r2;
+ if(CpuCaps::hasMMX())
+ {
+@@ -434,7 +439,7 @@ int a1,a2;
+ }
+ return 1;
+ }
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86)
+ static uint8_t tinySubstractMMX(uint8_t *dst, uint8_t *src1, uint8_t *src2,uint32_t l)
+ {
+ int delta;
+@@ -493,7 +498,7 @@ int ll,rr;
+ bool ADMImage::substract(ADMImage *src1,ADMImage *src2)
+ {
+
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86)
+ uint32_t r1,r2;
+ if(CpuCaps::hasMMX())
+ {
+@@ -589,7 +594,12 @@ static inline void yuv444_C(uint8_t *src,uint8_t *dst,int w,int h,int s)
+ src+=4*w;
+ }
+ }
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86) && !defined(__sun__)
++/*
++ On Solaris this raises the "relocations remain against allocatable
++ but non-writable sections" linker error at:
++ .data (section) 0x1149
++ */
+ static inline void yuv444_MMX(uint8_t *src,uint8_t *dst,int w,int h,int s)
+ {
+ static uint64_t __attribute__((used)) FUNNY_MANGLE(mask) = 0x00ff000000ff0000LL;
+@@ -981,7 +991,7 @@ bool ADMImage::convertFromYUV444(uint8_t *from)
+ uint8_t *dst=this->GetWritePtr(PLANAR_Y);
+ uint8_t *src=from;
+
+- #ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86) && !defined(__sun__)
+ if(CpuCaps::hasMMX())
+ yuv444_MMX(src,dst,width,height,stride);
+ else
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0009-setting-release-build.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0009-setting-release-build.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0009-setting-release-build.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,32 @@
+From 271f5476cf4c9c627eb6c480266fc23adca51bff Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 30 Oct 2013 17:41:14 +0100
+Subject: [PATCH] setting release build
+
+---
+ cmake/admMainChecks.cmake | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/cmake/admMainChecks.cmake b/cmake/admMainChecks.cmake
+index 9d17dd2..d7b02a1 100644
+--- a/cmake/admMainChecks.cmake
++++ b/cmake/admMainChecks.cmake
+@@ -51,10 +51,15 @@ IF (CMAKE_VERBOSE_MAKEFILE)
+ OPTION(VERBOSE "" ON)
+ ENDIF (CMAKE_VERBOSE_MAKEFILE)
+
++MESSAGE(STATUS "build type '${CMAKE_BUILD_TYPE}'")
+ IF (NOT CMAKE_BUILD_TYPE)
+ SET(CMAKE_BUILD_TYPE "Release")
+ ENDIF (NOT CMAKE_BUILD_TYPE)
+
++if (CMAKE_BUILD_TYPE STREQUAL "Release")
++ OPTION(RELEASE "" ON)
++endif (CMAKE_BUILD_TYPE STREQUAL "Release")
++
+ ########################################
+ # Avidemux system specific tweaks
+ ########################################
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0010-fabs-desambiguation.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0010-fabs-desambiguation.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0010-fabs-desambiguation.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,25 @@
+From 2876c12a2b7ed70a3dd01e8b4fa11d43de7e4079 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 30 Oct 2013 17:44:21 +0100
+Subject: [PATCH] fabs desambiguation
+
+---
+ avidemux/common/ADM_audioFilter/src/audiocopy.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux/common/ADM_audioFilter/src/audiocopy.cpp b/avidemux/common/ADM_audioFilter/src/audiocopy.cpp
+index 8189503..f7a938c 100644
+--- a/avidemux/common/ADM_audioFilter/src/audiocopy.cpp
++++ b/avidemux/common/ADM_audioFilter/src/audiocopy.cpp
+@@ -372,7 +372,7 @@ again:
+ {
+ uint64_t currentClock=clock->getTimeUs();
+ aprintf("Duping clockDts=%d, syncDts=%d\n",currentClock,nextDts);
+- if( fabs((double)nextDts-(double)currentClock<MIN_SKEW) || (currentClock>nextDts) )
++ if( (fabs((double)nextDts-(double)currentClock)<MIN_SKEW) || (currentClock>nextDts) )
+ {
+ aprintf("Close enough..\n");
+ changeState(Flushing);
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0011-POW10-definition.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0011-POW10-definition.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0011-POW10-definition.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,25 @@
+From 264a5caf07c299b8849b438b2b35811b6492fdc9 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 30 Oct 2013 17:46:35 +0100
+Subject: [PATCH] POW10 definition
+
+---
+ avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
+index 003bb50..c6cb43b 100644
+--- a/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
++++ b/avidemux/common/ADM_audioFilter/src/audiofilter_normalize.cpp
+@@ -32,7 +32,7 @@
+
+ #if defined (_WIN32) || defined (__HAIKU__)
+ #define POW10(x) pow(10,x)
+-#elif defined(ADM_BSD_FAMILY)
++#elif defined(ADM_BSD_FAMILY) || defined(__sun__)
+ #define POW10(x) powf(10.0,x)
+ #else
+ #define POW10(x) pow10f(x)
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0012-abs-desabiguation-3.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0012-abs-desabiguation-3.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0012-abs-desabiguation-3.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,48 @@
+From bc21cb6ef1a76ced08073b50d03db710b375387f Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 30 Oct 2013 17:49:30 +0100
+Subject: [PATCH] abs desabiguation 3
+
+---
+ avidemux/common/ADM_editor/src/ADM_edAudioPcm.cpp | 4 ++--
+ avidemux/common/ADM_editor/src/ADM_edAudioTrackExternal.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/avidemux/common/ADM_editor/src/ADM_edAudioPcm.cpp b/avidemux/common/ADM_editor/src/ADM_edAudioPcm.cpp
+index 472a65e..03214f7 100644
+--- a/avidemux/common/ADM_editor/src/ADM_edAudioPcm.cpp
++++ b/avidemux/common/ADM_editor/src/ADM_edAudioPcm.cpp
+@@ -103,7 +103,7 @@ again:
+ // Check if the Dts matches
+ if(lastDts!=ADM_AUDIO_NO_DTS &&packetBufferDts!=ADM_AUDIO_NO_DTS)
+ {
+- if(abs(lastDts-packetBufferDts)>ADM_ALLOWED_DRIFT_US)
++ if(abs(long(lastDts-packetBufferDts))>ADM_ALLOWED_DRIFT_US)
+ {
+ printf("[Composer::getPCMPacket] Track %d,%"PRIx64" : drift %d, computed :%"PRIu64" got %"PRIu64"\n",
+ (int)myTrackNumber,(uint64_t)trk,(int)(lastDts-packetBufferDts),lastDts,packetBufferDts);
+@@ -164,7 +164,7 @@ again:
+ decodedSample/=trk->wavheader.channels;
+ if(!decodedSample) goto again;
+ #define ADM_MAX_JITTER 5000 // in samples, due to clock accuracy, it can be +er, -er, + er, -er etc etc
+- if(abs(decodedSample-packetBufferSamples)>ADM_MAX_JITTER)
++ if(abs(int(decodedSample-packetBufferSamples))>ADM_MAX_JITTER)
+ {
+ ADM_warning("[Composer::getPCMPacket] Track %d:%x Demuxer was wrong %d vs %d samples!\n",
+ myTrackNumber,trk,packetBufferSamples,decodedSample);
+diff --git a/avidemux/common/ADM_editor/src/ADM_edAudioTrackExternal.cpp b/avidemux/common/ADM_editor/src/ADM_edAudioTrackExternal.cpp
+index 88b0a18..7263634 100644
+--- a/avidemux/common/ADM_editor/src/ADM_edAudioTrackExternal.cpp
++++ b/avidemux/common/ADM_editor/src/ADM_edAudioTrackExternal.cpp
+@@ -207,7 +207,7 @@ again:
+ decodedSample/=wavHeader.channels;
+ if(!decodedSample) goto again;
+ #define ADM_MAX_JITTER 5000 // in samples, due to clock accuracy, it can be +er, -er, + er, -er etc etc
+- if(abs(decodedSample-packetBufferSamples)>ADM_MAX_JITTER)
++ if(abs(int(decodedSample-packetBufferSamples))>ADM_MAX_JITTER)
+ {
+ ADM_warning("[PCMPacketExt::getPCMPacket] Track %d:%x Demuxer was wrong %d vs %d samples!\n",
+ 0,0,packetBufferSamples,decodedSample);
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0013-include-alloca-declaration.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0013-include-alloca-declaration.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0013-include-alloca-declaration.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,26 @@
+From a0f25f5fd1e44a85f8661c9bd554cea9df37acf6 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 30 Oct 2013 17:51:34 +0100
+Subject: [PATCH] include alloca declaration
+
+---
+ avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp b/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp
+index 8eac0f4..408af14 100644
+--- a/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp
++++ b/avidemux/common/ADM_videoCodec/src/ADM_ffmpeg_vdpau.cpp
+@@ -41,6 +41,9 @@ extern "C" {
+ #include "ADM_codecVdpau.h"
+ #include "ADM_threads.h"
+
++#if defined(__sun__)
++#include <alloca.h>
++#endif /* : defined(__sun__) */
+
+ static bool vdpauWorking=false;
+ static admMutex surfaceMutex;
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0014-fix-text-relocation-remains-referenced-2.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0014-fix-text-relocation-remains-referenced-2.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0014-fix-text-relocation-remains-referenced-2.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,43 @@
+From ae2684daadb118aab7964cf8f66620d88bc08133 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 30 Oct 2013 17:53:42 +0100
+Subject: [PATCH] fix text relocation remains referenced 2
+
+---
+ avidemux/qt4/ADM_UIs/src/T_openGL.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/avidemux/qt4/ADM_UIs/src/T_openGL.cpp b/avidemux/qt4/ADM_UIs/src/T_openGL.cpp
+index ba52716..ea415bc 100644
+--- a/avidemux/qt4/ADM_UIs/src/T_openGL.cpp
++++ b/avidemux/qt4/ADM_UIs/src/T_openGL.cpp
+@@ -279,7 +279,7 @@ bool ADM_coreVideoFilterQtGl::downloadTexture(ADMImage *image, ADM_PLANE plane,
+ return true;
+ }
+ typedef void typeGlYv444(const uint8_t *src,uint8_t *dst,const int width);
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86) && !defined(__sun__)
+ static inline void glYUV444_MMXInit(void)
+ {
+ static uint64_t __attribute__((used)) FUNNY_MANGLE(mask) = 0x00ff000000ff0000LL;
+@@ -355,7 +355,7 @@ bool ADM_coreVideoFilterQtGl::downloadTexturesQt(ADMImage *image, QGLFramebuffe
+ int width=image->GetWidth(PLANAR_Y);
+ int height=image->GetHeight(PLANAR_Y);
+ typeGlYv444 *luma=glYUV444_C;
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86) && !defined(__sun__)
+ if(CpuCaps::hasMMX())
+ {
+ glYUV444_MMXInit();
+@@ -451,7 +451,7 @@ bool ADM_coreVideoFilterQtGl::downloadTexturesDma(ADMImage *image, QGLFramebuff
+ int width=image->GetWidth(PLANAR_Y);
+ int height=image->GetHeight(PLANAR_Y);
+ typeGlYv444 *luma=glYUV444_C;
+- #ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86) && !defined(__sun__)
+ if(CpuCaps::hasMMX())
+ {
+ glYUV444_MMXInit();
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0015-avoid-empty-library.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0015-avoid-empty-library.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0015-avoid-empty-library.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,24 @@
+From ea3919d0a0026cbc0b161ae2992fddbc663f04a8 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 30 Oct 2013 19:34:30 +0100
+Subject: [PATCH] avoid empty library
+
+---
+ avidemux/cli/ADM_userInterfaces/ADM_filters/filter_none.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/avidemux/cli/ADM_userInterfaces/ADM_filters/filter_none.cpp b/avidemux/cli/ADM_userInterfaces/ADM_filters/filter_none.cpp
+index e69de29..481ec66 100644
+--- a/avidemux/cli/ADM_userInterfaces/ADM_filters/filter_none.cpp
++++ b/avidemux/cli/ADM_userInterfaces/ADM_filters/filter_none.cpp
+@@ -0,0 +1,7 @@
++#if defined(__sun__)
++/*
++ this is to avoid an empty library, with no symbols, raising
++ "ld: elf error: file libADM_filtersCli6.a: elf_getarsym"
++*/
++int Sun_ar_require_a_symbol_here_4_cli = 0;
++#endif /* : defined(__sun__) */
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0016-avoid-multiple-register-definition.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0016-avoid-multiple-register-definition.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0016-avoid-multiple-register-definition.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,28 @@
+From 3fa0645368406053739cc94f42adcb3c20d574b1 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 31 Oct 2013 17:11:31 +0100
+Subject: [PATCH] avoid multiple register definition
+
+---
+ avidemux_core/ADM_core/include/ADM_mangle.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/avidemux_core/ADM_core/include/ADM_mangle.h b/avidemux_core/ADM_core/include/ADM_mangle.h
+index 1ab0c48..cf17162 100644
+--- a/avidemux_core/ADM_core/include/ADM_mangle.h
++++ b/avidemux_core/ADM_core/include/ADM_mangle.h
+@@ -75,7 +75,10 @@
+ #define REG_d "edx"
+ #define REG_S "esi"
+ #define REG_D "edi"
+-#define REG_SP "esp"
++#if defined(__sun__) && defined(REG_SP)
++#undef REG_SP
++#endif /* : defined(__sun__) */
++#define REG_SP "esp"
+ #define REGSP esp
+ #define REG_BP "ebp"
+ #endif
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0017-abs-desabiguation-4.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0017-abs-desabiguation-4.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0017-abs-desabiguation-4.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,53 @@
+From c24a10e2d394c11b21d840890dfd74fc89d0eacf Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 31 Oct 2013 16:49:16 +0100
+Subject: [PATCH] abs desabiguation 4
+
+---
+ avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp | 2 +-
+ avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp | 2 +-
+ avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp b/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp
+index 18c8806..25f3455 100644
+--- a/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp
++++ b/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkv.cpp
+@@ -263,7 +263,7 @@ bool mkvHeader::ComputeDeltaAndCheckBFrames(uint32_t *minDeltaX, uint32_t *maxDe
+ ADM_info("Maximum delta found %"PRId64" us\n",maxDelta);
+ if(minDelta)
+ {
+- if(minDelta<track->_defaultFrameDuration && abs(minDelta-track->_defaultFrameDuration)>1000)
++ if(minDelta<track->_defaultFrameDuration && abs((long)(minDelta-track->_defaultFrameDuration))>1000)
+ {
+ ADM_info("Changing default frame duration from %"PRIu64" to %"PRIu64" us\n",
+ track->_defaultFrameDuration,minDelta);
+diff --git a/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp b/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp
+index df0cd80..f7dd2c5 100644
+--- a/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp
++++ b/avidemux_plugins/ADM_muxers/muxerAvi/muxerAvi.cpp
+@@ -124,7 +124,7 @@ bool muxerAvi::fillAudio(uint64_t targetDts)
+ aprintf("[Audio] Packet size %"PRIu32" sample:%"PRIu32" dts:%"PRIu64" target :%"PRIu64"\n",
+ aPacket->sizeInBytes,aPacket->nbSamples,aPacket->dts,targetDts);
+ if(aPacket->dts!=ADM_NO_PTS)
+- if( abs(aPacket->dts-clk->getTimeUs())>32000)
++ if( abs((long)(aPacket->dts-clk->getTimeUs()))>32000)
+ {
+ ADM_warning("[AviMuxer] Audio skew!\n");
+ clk->setTimeUs(aPacket->dts);
+diff --git a/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp b/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp
+index 1541d06..0c0a2ed 100644
+--- a/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp
++++ b/avidemux_plugins/ADM_muxers/muxerMp4v2/muxerMp4v2Audio.cpp
+@@ -265,7 +265,7 @@ bool muxerMp4v2::fillAudio(uint64_t targetDts)
+ bprintf("Current audio Dts=%"PRId64"\n",currentDts);
+ bprintf("Incoming block, dts=%"PRId64"\n",currentBlock->dts);
+ bprintf("Delta =%d ms\n",(int)(currentDts-currentBlock->dts));
+- if( abs(currentBlock->dts-currentDts)>MP4V2_MAX_JITTER)
++ if( abs((long)(currentBlock->dts-currentDts))>MP4V2_MAX_JITTER)
+ {
+ if(currentBlock->dts<currentDts)
+ {
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0018-floor-desabiguation.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0018-floor-desabiguation.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0018-floor-desabiguation.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,25 @@
+From 79a32b8ed82e45d113cb56ffec84f7ef0b2e1ec5 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Thu, 31 Oct 2013 16:51:17 +0100
+Subject: [PATCH] floor desabiguation
+
+---
+ avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp b/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp
+index db483f0..93c2fd4 100644
+--- a/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp
++++ b/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvEntries.cpp
+@@ -194,7 +194,7 @@ uint8_t mkvHeader::analyzeOneTrack(void *head,uint32_t headlen)
+
+ }
+
+- _mainaviheader.dwMicroSecPerFrame=(uint32_t)floor(50);;
++ _mainaviheader.dwMicroSecPerFrame=(uint32_t)floor(50.0F);;
+ _videostream.fccType=fourCC::get((uint8_t *)"vids");
+ _video_bih.biBitCount=24;
+ _videostream.dwInitialFrames= 0;
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0019-fix-linker-script-option.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0019-fix-linker-script-option.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0019-fix-linker-script-option.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,51 @@
+From c13e1fa445fce9d4e13e7c7d72e9d43195b4136a Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 1 Nov 2013 11:10:00 +0100
+Subject: [PATCH] fix linker script option
+
+---
+ avidemux_plugins/ADM_scriptEngines/qtScript/src/CMakeLists.txt | 2 +-
+ avidemux_plugins/ADM_scriptEngines/spiderMonkey/src/CMakeLists.txt | 2 +-
+ avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/avidemux_plugins/ADM_scriptEngines/qtScript/src/CMakeLists.txt b/avidemux_plugins/ADM_scriptEngines/qtScript/src/CMakeLists.txt
+index b1885ac..0ee3977 100644
+--- a/avidemux_plugins/ADM_scriptEngines/qtScript/src/CMakeLists.txt
++++ b/avidemux_plugins/ADM_scriptEngines/qtScript/src/CMakeLists.txt
+@@ -36,7 +36,7 @@ target_link_libraries(
+ INSTALL_SCRIPT_ENGINE(ADM_script_qt)
+
+ if (NOT APPLE)
+- target_link_libraries(ADM_script_qt -Wl,--version-script,"${CMAKE_CURRENT_SOURCE_DIR}/ADM_script_qt.v")
++ target_link_libraries(ADM_script_qt -Wl,-M,"${CMAKE_CURRENT_SOURCE_DIR}/ADM_script_qt.v")
+ endif (NOT APPLE)
+
+ if (QT_QTSCRIPTTOOLS_FOUND)
+diff --git a/avidemux_plugins/ADM_scriptEngines/spiderMonkey/src/CMakeLists.txt b/avidemux_plugins/ADM_scriptEngines/spiderMonkey/src/CMakeLists.txt
+index 1218a23..e35f7df 100644
+--- a/avidemux_plugins/ADM_scriptEngines/spiderMonkey/src/CMakeLists.txt
++++ b/avidemux_plugins/ADM_scriptEngines/spiderMonkey/src/CMakeLists.txt
+@@ -46,5 +46,5 @@ endif (USE_SYSTEM_SPIDERMONKEY)
+ target_link_libraries(ADM_script_spiderMonkey ADM_coreUI6 ADM_coreUtils6 ADM_scriptDF ADM_coreScript ADM_core6)
+
+ if (NOT APPLE)
+- target_link_libraries(ADM_script_spiderMonkey -Wl,--version-script,"${CMAKE_CURRENT_SOURCE_DIR}/ADM_script_spiderMonkey.v")
++ target_link_libraries(ADM_script_spiderMonkey -Wl,-M,"${CMAKE_CURRENT_SOURCE_DIR}/ADM_script_spiderMonkey.v")
+ endif (NOT APPLE)
+diff --git a/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt b/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt
+index 7ac388e..15176b9 100644
+--- a/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt
++++ b/avidemux_plugins/ADM_scriptEngines/tinyPy/src/CMakeLists.txt
+@@ -24,7 +24,7 @@ include_directories(${AVIDEMUX_TOP_SOURCE_DIR}/avidemux/common/ADM_editor/includ
+ target_link_libraries(ADM_script_tinyPy ADM_coreScript ADM_coreUtils6 ADM_core6 ADM_coreUI6 m)
+
+ if (NOT APPLE)
+- target_link_libraries(ADM_script_tinyPy -Wl,--version-script,"${CMAKE_CURRENT_SOURCE_DIR}/ADM_script_tinyPy.v")
++ target_link_libraries(ADM_script_tinyPy -Wl,-M,"${CMAKE_CURRENT_SOURCE_DIR}/ADM_script_tinyPy.v")
+ elseif (NOT ADM_CPU_X86_64)
+ target_link_libraries(ADM_script_tinyPy -Wl,-read_only_relocs,suppress)
+ endif (NOT APPLE)
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0020-fabs-desambiguation-2.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0020-fabs-desambiguation-2.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0020-fabs-desambiguation-2.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,25 @@
+From 7b88926104f32a87e388b92e2c4914b2c73306e8 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 1 Nov 2013 14:16:38 +0100
+Subject: [PATCH] fabs desambiguation 2
+
+---
+ avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp b/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp
+index 4abd94f..a74a5b7 100644
+--- a/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp
++++ b/avidemux_plugins/ADM_scriptEngines/tinyPy/src/tinypy/tinypy.cpp
+@@ -1881,7 +1881,7 @@ tp_obj tp_str(TP,tp_obj self) {
+ if (type == TP_STRING) { return self; }
+ if (type == TP_NUMBER) {
+ tp_num v = self.number.val;
+- if ((fabs(v)-fabs((long)v)) < 0.000001) { return tp_printf(tp,"%ld",(long)v); }
++ if ((fabs(v)-fabs((tp_num)(long)v)) < 0.000001) { return tp_printf(tp,"%ld",(long)v); }
+ return tp_printfFloat(tp,"%f",v);
+ } else if(type == TP_DICT) {
+ return tp_printf(tp,"<dict 0x%x>",self.dict.val);
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0021-fix-text-relocation-remains-referenced-3.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0021-fix-text-relocation-remains-referenced-3.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0021-fix-text-relocation-remains-referenced-3.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,25 @@
+From 18a2b83bbef0d28f079f2ae74bf931f5b7f462b6 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 1 Nov 2013 14:19:45 +0100
+Subject: [PATCH] fix text relocation remains referenced 3
+
+---
+ avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp b/avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp
+index bfdc43e..eb8867b 100644
+--- a/avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp
++++ b/avidemux_plugins/ADM_videoFilters6/fluxSmooth/ADM_vidFluxAsm.cpp
+@@ -178,7 +178,7 @@ void attribute_used ADMVideoFlux::DoFilter_C(
+ ADM_assert(ycnt == 0);
+
+ }
+-#ifdef ADM_CPU_X86
++#if defined(ADM_CPU_X86) && !defined(__sun__)
+ /*
+ __asm movq mm2, mm0 \
+ __asm movq mm3, mm1 \
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0022-abs-desabiguation-5.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0022-abs-desabiguation-5.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0022-abs-desabiguation-5.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,34 @@
+From 804ad9cbcffd36c7624a11c7b6b95f74b1762083 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 1 Nov 2013 14:21:39 +0100
+Subject: [PATCH] abs desabiguation 5
+
+---
+ avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp b/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp
+index 4052fcf..4fba3d9 100644
+--- a/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp
++++ b/avidemux_plugins/ADM_videoFilters6/telecide/Telecide_getFrame.cpp
+@@ -245,7 +245,7 @@ teleCide *_param=&configuration;
+ {
+ // The chosen frame doesn't match the prediction.
+ if (predicted_metric == 0) mismatch = 0.0;
+- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
++ else mismatch = (100.0*abs((int)(predicted_metric - lowest)))/predicted_metric;
+ if (mismatch < gthresh)
+ {
+ // It's close enough, so use the predicted one.
+@@ -288,7 +288,7 @@ teleCide *_param=&configuration;
+ {
+ // The chosen frame doesn't match the prediction.
+ if (predicted_metric == 0) mismatch = 0.0;
+- else mismatch = (100.0*abs(predicted_metric - lowest))/predicted_metric;
++ else mismatch = (100.0*abs((int)(predicted_metric - lowest)))/predicted_metric;
+ if ((int) mismatch <= gthresh)
+ {
+ // It's close enough, so use the predicted one.
+--
+1.8.3.4
+
Added: csw/mgar/pkg/avidemux/trunk/files/0023-fix-font-reference.patch
===================================================================
--- csw/mgar/pkg/avidemux/trunk/files/0023-fix-font-reference.patch (rev 0)
+++ csw/mgar/pkg/avidemux/trunk/files/0023-fix-font-reference.patch 2013-11-04 17:08:32 UTC (rev 22385)
@@ -0,0 +1,29 @@
+From 6a2343f9fbdd99abc81ef96d746b37f624ed557b Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Mon, 4 Nov 2013 14:48:08 +0100
+Subject: [PATCH] fix font reference
+
+---
+ avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp b/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp
+index 2efb87a..19c0a38 100644
+--- a/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp
++++ b/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp
+@@ -69,7 +69,11 @@ DECLARE_VIDEO_FILTER( subAss, // Class
+ # define DEFAULT_FONT_DIR "c:"
+ # else
+ # define DIR_SEP '/'
+-# define DEFAULT_FONT_DIR "/usr/share/fonts/truetype/"
++# if defined(__sun__)
++# define DEFAULT_FONT_DIR "/opt/csw/share/fonts/truetype/"
++# else
++# define DEFAULT_FONT_DIR "/usr/share/fonts/truetype/"
++# endif
+ # endif
+ #endif
+ //*****************
+--
+1.8.3.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list