Commit 5b000794 authored by Anke's avatar Anke

yarock, gammu, avidemux updates

parent af28b8ee
diff --git a/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp b/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp
index 33b2a7f..99f0664 100644
--- a/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp
+++ b/avidemux/ADM_coreImage/src/ADM_interlaceUtil.cpp
@@ -30,19 +30,8 @@ Skip factor=2
***************************************************************************/
#include "ADM_default.h"
-
-//#include "ADM_editor/ADM_edit.hxx"
#include "ADM_videoFilter.h"
-//#define MMX_TRACE
-#warning remove mmxmacro and debug asm
-//#define ASM_ILACING
-
-
-#include "ADM_mmxMacros.h"
-
-
-
#define SKIP_FACTOR 2 // 2^SKIPFACTOR=SKIP_LINEAR+1
#define SKIP_LINEAR 3
@@ -62,7 +51,7 @@ Skip factor=2
*/
#if defined(ADM_CPU_X86) && defined(ASM_ILACING)
-
+#warning REWRITE IN PLAIN ASM
static uint32_t ADMVideo_interlaceCount_MMX( uint8_t *src ,uint32_t w, uint32_t h);
static uint8_t * FUNNY_MANGLE(_l_p) =NULL;
static uint8_t * FUNNY_MANGLE(_l_c) =NULL;
diff --git a/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp b/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
index 61d11d4..479731c 100644
--- a/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
+++ b/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp
@@ -20,15 +20,13 @@
***************************************************************************/
#include "ADM_default.h"
-
#include "ADM_videoFilter.h"
-
#include"ADM_vidField.h"
#ifdef ADM_CPU_X86
// #define DEBUG_DEINT 1
// #define MMX_TRACE 1
- #include "ADM_mmxMacros.h"
+// #include "ADM_mmxMacros.h"
void myDeintASM(void);
@@ -36,25 +34,27 @@
static uint8_t * FUNNY_MANGLE(_l_p) , * FUNNY_MANGLE(_l_c) ,* FUNNY_MANGLE(_l_n);
static uint8_t * FUNNY_MANGLE(_l_e) , * FUNNY_MANGLE(_l_e2);
#define EXPAND(x) (x)+((x)<<16)+((x)<<32) +((x)<<48)
-static mmx_t _mmTHRESH1;
-static mmx_t _mmTHRESH2;
+static uint64_t __attribute__((used)) __attribute__ ((__aligned__ (8))) FUNNY_MANGLE(_mmTHRESH1) ;
+static uint64_t __attribute__((used)) __attribute__ ((__aligned__ (8))) FUNNY_MANGLE(_mmTHRESH2) ;
-#define COMPUTE_MMX \
-punpcklbw_r2r(mm5,mm0); /*c expand 4 bytes -> 4 word */ \
-punpcklbw_r2r(mm5,mm1); /*p*/ \
-punpcklbw_r2r(mm5,mm2); /* n*/ \
-movq_r2r(mm0,mm3); /* mm3 also c*/ \
-psubw_r2r(mm1,mm0) ; /* mm0=mm0-mm1 = c-p*/ \
-psubw_r2r(mm2,mm3) ; /* mm3=mm3-mm2 = c-n*/ \
-psraw_i2r(1,mm0); /* to protect from overflow*/ \
-psraw_i2r(1,mm3);\
-pmullw_r2r(mm0,mm3); /* mm3=(c-p)*(c-n) / 4;*/ \
-movq_r2r(mm3,mm0) ; /* mm0 also c-p*c-n */ \
-pcmpgtw_r2r(mm4,mm3); /* keep only > size*/ \
-pcmpgtw_r2r(mm6,mm0); /* keep only > size*/ \
-packsswb_r2r(mm5,mm0); \
-packsswb_r2r(mm5,mm3);
+#define COMPUTE_MMX \
+__asm__ __volatile__(\
+"punpcklbw %%mm5,%%mm0\n\t" \
+"punpcklbw %%mm5,%%mm1\n\t" \
+"punpcklbw %%mm5,%%mm2\n\t" \
+"movq %%mm0,%%mm3\n\t" \
+"psubw %%mm1,%%mm0\n\t" \
+"psubw %%mm2,%%mm3\n\t" \
+"psraw $1,%%mm0\n\t" \
+"psraw $1,%%mm3\n\t" \
+"pmullw %%mm0,%%mm3\n\t" \
+"movq %%mm3,%%mm0\n\t" \
+"pcmpgtw %%mm4,%%mm3\n\t" \
+"pcmpgtw %%mm6,%%mm0\n\t" \
+"packsswb %%mm5,%%mm0\n\t" \
+"packsswb %%mm5,%%mm3\n\t" \
+::)
#endif
void ADMVideoFields::hasMotion_C(uint8_t *p,uint8_t *c,
@@ -90,8 +90,8 @@ void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
{
- _mmTHRESH1.uq=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) );
- _mmTHRESH2.uq=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) );
+ _mmTHRESH1=EXPAND((uint64_t ) ((_param->motion_trigger*_param->motion_trigger)>>2) );
+ _mmTHRESH2=EXPAND((uint64_t ) ((_param->blend_trigger*_param->blend_trigger)>>2) );
_l_h=_info.height-2;
_l_w=_info.width>>2;
@@ -102,10 +102,11 @@ void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c,
_l_e=e;
_l_e2=e2;
// printf("\n MMX \n");
-
- pxor_r2r(mm5,mm5);
- movq_m2r(_mmTHRESH1,mm4);
- movq_m2r(_mmTHRESH2,mm6);
+ __asm__ __volatile__ (
+ "pxor %%mm5,%%mm5\n\t"
+ "movq "Mangle(_mmTHRESH1)",%%mm4\n\t"
+ "movq "Mangle(_mmTHRESH2)",%%mm6\n\t"
+ ::);
myDeintASM();
}
#if !defined(DEBUG_DEINT)
@@ -149,7 +150,7 @@ void myDeintASM(void)
:
: "eax", "ecx","edx","esi"
);
- emms();
+ __asm__ __volatile__ ("emms");
}
#else
--- cmake/config.h.cmake.orig 2010-10-29 12:51:05.000000000 -0400
+++ cmake/config.h.cmake 2010-10-29 12:51:48.000000000 -0400
@@ -76,9 +76,7 @@
/* use Nvwa memory leak detector */
#cmakedefine FIND_LEAKS
-#if defined(OSS_SUPPORT) || defined (USE_ARTS) || defined(USE_SDL) || defined(__APPLE__) || defined(__WIN32) || defined(ALSA_SUPPORT)
#define HAVE_AUDIO
-#endif
#define HAVE_ENCODER
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# maintainer (abveritas[at]chakra-project[dog]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgbase=avidemux
pkgname=('avidemux-cli' 'avidemux')
pkgver=2.5.5
pkgver=2.5.6
pkgrel=1
pkgdesc='Simple video editor for cutting, filtering and encoding tasks.'
arch=('i686' 'x86_64')
......@@ -18,28 +17,28 @@ url="http://fixounet.free.fr/avidemux/"
makedepends=('cmake' 'libxslt' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv'
'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' 'opencore-amr' 'yasm')
source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
md5sums=('33bbe210c6826cea1987ed18a41d57a7')
md5sums=('00e479dd806b94a98d3f0f40639e88a9')
build() {
cd "${srcdir}/${pkgbase}_${pkgver}"
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=0 -D QT4=1 .. || return 1
make || return 1
make
# plugin build expects libraries to be already installed; we fake a prefix
# in build/ by symlinking all libraries to build/lib/
mkdir -p lib
cd lib
find ../avidemux -name '*.so*' | xargs ln -sft . || return 1
find ../avidemux -name '*.so*' | xargs ln -sft .
cd ../../plugins
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR=${srcdir}/avidemux_${pkgver} \
-D AVIDEMUX_CORECONFIG_DIR=${srcdir}/avidemux_${pkgver}/build/config \
-D AVIDEMUX_INSTALL_PREFIX=${srcdir}/avidemux_${pkgver}/build \
-D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=0 -D QT4=1 .. || return 1
make || return 1
-D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=0 -D QT4=1 ..
make
}
package_avidemux-cli() {
......@@ -56,10 +55,10 @@ package_avidemux-cli() {
'xvidcore: for the corresponding video encoder plugin')
cd "${srcdir}/${pkgbase}_${pkgver}/build"
make DESTDIR="${pkgdir}" install || return 1
make DESTDIR="${pkgdir}" install
cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
make DESTDIR="${pkgdir}" install || return 1
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}"/usr/share/avidemux
rm "${pkgdir}"/usr/bin/avidemux2_qt4
rm "${pkgdir}"/usr/lib/*{_qt4,QT4}.so
......@@ -70,8 +69,8 @@ package_avidemux-cli() {
ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" || return 1
install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" || return 1
install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
}
package_avidemux() {
......@@ -79,7 +78,7 @@ package_avidemux() {
depends=('avidemux-cli' 'qt')
cd "${srcdir}/${pkgbase}_${pkgver}"
install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux" || return 1
install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux"
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
......@@ -91,7 +90,7 @@ package_avidemux() {
install -d "${pkgdir}/usr/share/avidemux/i18n"
install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux.desktop" || return 1
sed -i 's/Name=avidemux2/Name=avidemux/' "${pkgdir}/usr/share/applications/avidemux.desktop" || return 1
sed -i 's/avidemux2_gtk/avidemux/' "${pkgdir}/usr/share/applications/avidemux.desktop" || return 1
install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux.desktop"
sed -i 's/Name=avidemux2/Name=avidemux/' "${pkgdir}/usr/share/applications/avidemux.desktop"
sed -i 's/avidemux2_gtk/avidemux/' "${pkgdir}/usr/share/applications/avidemux.desktop"
}
diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-07-11 21:12:49.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-07-11 21:14:03.000000000 -0400
@@ -73,7 +73,7 @@
#ifdef __APPLE__
QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
#else
- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
+ QString appdir = "/usr/share/avidemux/i18n/";
#endif
loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
@@ -164,4 +164,4 @@
}
return "Qt";
-}
\ No newline at end of file
+}
diff -Naur avidemux_2.5.0.orig/cmake/Ts.cmake avidemux_2.5.0/cmake/Ts.cmake
--- avidemux_2.5.0.orig/cmake/Ts.cmake 2009-07-11 21:12:51.000000000 -0400
+++ avidemux_2.5.0/cmake/Ts.cmake 2009-07-11 21:22:34.000000000 -0400
@@ -64,7 +64,7 @@
SET(qm_files ${qm_files} ${_outXml} ${_out})
- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
ENDFOREACH(ts_input ${ts_files})
SET(${_sources} ${${_sources}} ${qm_files})
@@ -95,7 +95,7 @@
SET(qm_files ${qm_files} ${_out})
- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
ENDFOREACH(ts_input ${ts_files})
SET(${_sources} ${${_sources}} ${qm_files})
diff -Nur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2010-10-10 06:45:42.000000000 -0700
+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-01-16 07:16:48.283341102 -0800
@@ -1386,7 +1386,7 @@
case X264_WEIGHTP_NONE:
strcpy((char*)xmlBuffer, "none");
break;
- case X264_WEIGHTP_BLIND:
+ case X264_WEIGHTP_SIMPLE:
strcpy((char*)xmlBuffer, "blind");
break;
case X264_WEIGHTP_SMART:
@@ -1896,7 +1896,7 @@
int weightedPredPFrames = X264_WEIGHTP_NONE;
if (strcmp(content, "blind") == 0)
- weightedPredPFrames = X264_WEIGHTP_BLIND;
+ weightedPredPFrames = X264_WEIGHTP_SIMPLE;
else if (strcmp(content, "smart") == 0)
weightedPredPFrames = X264_WEIGHTP_SMART;
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (abveritas[at]chakra-project[dog]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=gammu
pkgver=1.30.0
pkgver=1.31.0
pkgrel=1
pkgdesc="GNU All Mobile Management Utilities"
arch=('i686' 'x86_64')
......@@ -9,9 +17,9 @@ depends=('bluez' 'curl' 'libmysqlclient'
'postgresql-libs' 'python2' 'libusb' 'gnutls')
makedepends=('cmake' 'doxygen' 'mysql')
optdepends=('dialog: support for the gammu-config script')
options=('!makeflags')
#options=('!makeflags')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
md5sums=('5bb061f1299e7ae8d38ecac1b8b11465')
md5sums=('9b1ff5d84730f025802b961ab9f26717')
build() {
cd "$srcdir/$pkgname-$pkgver"
......
......@@ -5,7 +5,7 @@
pkgname=yarock
_pkgname=Yarock
pkgver=0.0.53
pkgver=0.0.54
pkgrel=1
pkgdesc="A Qt4 Modern Music Player with collection browser based on cover art."
arch=('i686' 'x86_64')
......@@ -14,18 +14,18 @@ screenshot="http://qt-apps.org/CONTENT/content-pre2/129372-2.png"
license=('GPL3')
depends=('qt' 'taglib' 'phonon')
source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/${_pkgname}_${pkgver}_source.tar.gz)
md5sums=('cca8af0d83af30364941e0ae285175d5')
md5sums=('369c91d9b210f374cb43a575f4834f00')
build() {
cd $srcdir/${_pkgname}_${pkgver}_source
# Fix Phonon include path.
pushd src
sed -i \
-e "s#include <Phonon/Global>#include <phonon/Global>#" \
mainwindow.h \
EnginePlayer/inforesolver.h
popd
#pushd src
# sed -i \
# -e "s#include <Phonon/Global>#include <phonon/Global>#" \
# mainwindow.h \
# EnginePlayer/inforesolver.h
#popd
# Build.
qmake PREFIX=/usr
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment