You are not logged in.

Pages: 1

#1 2009-07-06 07:42:15

wantilles
Member
From: Athens - Greece
Registered: 2007-03-29
Posts: 327

Proposed new avidemux 2.5.0 packages

Here is a first attempt at packaging the new avidemux 2.5.0.

Since my C/C++ knowledge is minimal (at best) I would very much appreciate if someone more experienced glanced over the patches.

So far, I have only finished with the core of the application. I will deal with the plugins in the following days.

PKGBUILD

pkgname=avidemux
pkgver=2.5.0
pkgrel=1
pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
arch=('i686' 'x86_64')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
depends=('libxv' 'libvorbis' 'libxml2' 'alsa-lib' 'lame' 'xvidcore' 'faad2>=2.7' 'faac' 'sdl' 'x264>=20090416')
makedepends=('cmake' 'libxslt' 'gtk2' 'qt')
optdepends=('gtk2: for using the GTK GUI' 'qt: for using the QT4 GUI')
options=('!makeflags')
source=(http://download.berlios.de/avidemux/${pkgname}_${pkgver}.tar.gz
        avidemux-2.5.0-gcc-4.4.patch
        avidemux.desktop)
md5sums=('69624352ac4e4cbb507e02b2bace5f56'
         '902dc113c1bc7c4426a1d627f9acb286'
         'a9cf864c209782307afda5bc6a33a0cd')

build() {
  cd ${srcdir}/${pkgname}_${pkgver}

  #Patch for gcc 4.4.x
  patch -Np1 -i "${srcdir}/avidemux-2.5.0-gcc-4.4.patch" || return 1

  mkdir build
  cd build
  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D NO_GTK=0 -D NO_QT4=0 .. || return 1
  make || return 1
  make DESTDIR=${pkgdir} install || return 1

  install -D -m644 ../avidemux_icon.png ${pkgdir}/usr/share/pixmaps/avidemux.png || return 1
  install -D -m644 ${srcdir}/avidemux.desktop ${pkgdir}/usr/share/applications/avidemux.desktop || return 1
  install -D -m644 ../man/avidemux.1 ${pkgdir}/usr/share/man/man1/avidemux.1 || return 1
}

avidemux-2.5.0-gcc-4.4.patch

--- avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp
+++ avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp
@@ -681,7 +681,7 @@
 */

 const char *ADM_GetFileName(const char *str)

 {

-    char *filename;

+    const char *filename;

     char *filename2;

 

 #ifndef __WIN32

--- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h
+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h
@@ -19,6 +19,8 @@
 #ifndef ADM_COREUI_TOOLKIT__
 #define ADM_COREUI_TOOLKIT__
 
+#include <stdint.h>
+
 typedef enum 
 {
         ADM_LOG_NONE=0,
--- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_enter.h
+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_enter.h
@@ -16,6 +16,8 @@
 #ifndef DIA_ENTER_H
 #define DIA_ENTER_H
 
+#include <stdint.h>
+
 //  Get a float value
 uint8_t  DIA_GetFloatValue(float *value, float min, float max, const char *title, const char *legend);
 //  Get an integer value
--- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_fileSel.h
+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_fileSel.h
@@ -15,6 +15,9 @@
 
 #ifndef DIA_FILESEL_H
 #define DIA_FILESEL_H
+
+#include <stdint.h>
+
 typedef void SELFILE_CB(const char *);
 
 // Associated functions type
--- avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
+++ avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
@@ -71,7 +71,7 @@
 */
 uint8_t fileParser::open( const char *filename,FP_TYPE *multi )
 {
-        char *dot = NULL;                   // pointer to the last dot in filename
+        const char *dot = NULL;             // pointer to the last dot in filename
         uint8_t decimals = 0;               // number of decimals
         char *left = NULL, *number = NULL, *right = NULL; // parts of filename (after splitting)
 
--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
+++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
@@ -104,7 +104,7 @@
 
 int y4m_parse_ratio(y4m_ratio_t *r, const char *s)
 {
-  char *t = strchr(s, ':');
+  const char *t = strchr(s, ':');
   if (t == NULL) return Y4M_ERR_RANGE;
   r->n = atoi(s);
   r->d = atoi(t+1);
--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
+++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
@@ -53,7 +53,7 @@
 
 bool LPCMStream::Probe(IBitStream &bs )
 {
-    char *last_dot = strrchr( bs.StreamName(), '.' );
+    const char *last_dot = strrchr( bs.StreamName(), '.' );
     return 
         last_dot != NULL 
         && strcmp( last_dot+1, "lpcm") == 0;
--- avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h
+++ avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h
@@ -1,6 +1,7 @@
 #ifndef T_threadCount_h

 #define T_threadCount_h

 

+#include <stdint.h>
 #include <QtGui/QButtonGroup>

 #include <QtGui/QGridLayout>

 #include <QtGui/QLabel>

--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h
@@ -18,6 +18,8 @@
 #ifndef ADM_TRAY_H
 #define ADM_TRAY_H
 
+#include <stdint.h>
+
 class ADM_tray
 {
 protected:
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <QtGui/QColorDialog>

 

 #include "ADM_toolkitQt.h"

@@ -17,4 +18,4 @@
     }

 

     return 0;

-}
\ No newline at end of file
+}
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h
@@ -1,6 +1,8 @@
 #ifndef Q_jobs_h

 #define Q_jobs_h

 

+#include <cstdio>
+#include <stdint.h>
 #include "ui_jobs.h"

 #include "ADM_misc.h"

 

--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.h
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.h
@@ -1,6 +1,7 @@
 #ifndef Q_license_h

 #define Q_license_h

 

+#include <stdint.h>
 #include "ui_license.h"

 

 class Ui_licenseWindow : public QDialog

--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
@@ -1,6 +1,9 @@
 #ifndef ADM_Q_SLIDER_H
 #define ADM_Q_SLIDER_H
 
+#include <cstdio>
+#include <stdint.h>
+
 class ADM_QSlider : public QSlider
 {
 protected:
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
@@ -8,6 +8,7 @@
 //
 //
 
+#include <stdint.h>
 #include "config.h"
 
 #include <QtGui/QApplication>

The application core, builds and runs correctly, without any crashes or odd behavior.



PS: For the plugins, a second cmake will be issued after the first, something like:

  cd ${srcdir}/${pkgname}_${pkgver}/plugins

  cmake -DAVIDEMUX_LIB_DIR=/usr/lib -DAVIDEMUX_SOURCE_DIR=${srcdir}/${pkgname}_${pkgver} \
    -DAVIDEMUX_CORECONFIG_DIR=${srcdir}/${pkgname}_${pkgver}/build/config \
    -DAVIDEMUX_INSTALL_PREFIX=/usr  -D CMAKE_BUILD_TYPE=Release .. || return 1

Last edited by wantilles (2009-07-10 21:48:16)

Offline

#2 2009-07-08 01:13:18

whaevr
Member
Registered: 2008-03-17
Posts: 182

Re: Proposed new avidemux 2.5.0 packages

Went through and did that manually X.x then made the patch again to get the formatting back, here it is

http://pastebin.com/pastebin.php?dl=m798d0f4e

rename to avidemux-2.5.0-gcc-4.4.patch and with the bottom you posted it all compiled fine but also has to be applied from $srcdir instead of $srcdir/avidemux_2.5.0

Hopefully you can get the outside stuff to work too?

Last edited by whaevr (2009-07-08 02:47:42)

Offline

#3 2009-07-08 10:35:37

wantilles
Member
From: Athens - Greece
Registered: 2007-03-29
Posts: 327

Re: Proposed new avidemux 2.5.0 packages

whaevr wrote:

Hopefully you can get the outside stuff to work too?

This is going to be very tricky.

Offline

#4 2009-07-08 11:54:43

whaevr
Member
Registered: 2008-03-17
Posts: 182

Re: Proposed new avidemux 2.5.0 packages

Why is avidemux not ready for gcc 4.4...?

4.4 has been out for a bit now.

Offline

#5 2009-07-08 15:24:17

wantilles
Member
From: Athens - Greece
Registered: 2007-03-29
Posts: 327

Re: Proposed new avidemux 2.5.0 packages

Okay here are the final PKGBUILDs, built, tested and working:

avidemux
PKGBUILD

pkgname=avidemux
pkgver=2.5.0
pkgrel=1
pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
arch=('i686' 'x86_64')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
depends=('libxv' 'libvorbis' 'libxml2' 'alsa-lib' 'lame' 'xvidcore' 'faad2>=2.7' 'faac' 'sdl' 'x264>=20090416')
makedepends=('cmake' 'libxslt' 'gtk2' 'qt')
optdepends=('gtk2: for using the GTK GUI' 'qt: for using the QT4 GUI')
options=('!makeflags')
source=(http://download.berlios.de/avidemux/${pkgname}_${pkgver}.tar.gz
        avidemux-2.5.0-gcc-4.4.patch
        avidemux.desktop)
md5sums=('69624352ac4e4cbb507e02b2bace5f56'
         '902dc113c1bc7c4426a1d627f9acb286'
         'a9cf864c209782307afda5bc6a33a0cd')

build() {
  cd ${srcdir}/${pkgname}_${pkgver}

  #Patch for gcc 4.4.x
  patch -Np1 -i "${srcdir}/avidemux-2.5.0-gcc-4.4.patch" || return 1

  mkdir build
  cd build
  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D NO_GTK=0 -D NO_QT4=0 .. || return 1

  make || return 1
  make DESTDIR=${pkgdir} install || return 1

  install -D -m644 ../avidemux_icon.png ${pkgdir}/usr/share/pixmaps/avidemux.png || return 1
  install -D -m644 ${srcdir}/avidemux.desktop ${pkgdir}/usr/share/applications/avidemux.desktop || return 1
  install -D -m644 ../man/avidemux.1 ${pkgdir}/usr/share/man/man1/avidemux.1 || return 1

  #Get the source tarball for the plugins afterwards
  cd ${srcdir}
  mkdir -p temp/avidemux-plugins_${pkgver}
  cd ${srcdir}/${pkgname}_${pkgver}
  cp -a ./ ${srcdir}/temp/avidemux-plugins_${pkgver}/
  cd ${srcdir}/temp
  tar -cvjpsSf ${startdir}/avidemux-plugins_${pkgver}.tar.bz2 ./
}

avidemux-2.5.0-gcc-4.4.patch

--- avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp
+++ avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp
@@ -681,7 +681,7 @@
 */
 const char *ADM_GetFileName(const char *str)
 {
-    char *filename;
+    const char *filename;
     char *filename2;
 
 #ifndef __WIN32
--- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h
+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h
@@ -19,6 +19,8 @@
 #ifndef ADM_COREUI_TOOLKIT__
 #define ADM_COREUI_TOOLKIT__
 
+#include <stdint.h>
+
 typedef enum 
 {
         ADM_LOG_NONE=0,
--- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_enter.h
+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_enter.h
@@ -16,6 +16,8 @@
 #ifndef DIA_ENTER_H
 #define DIA_ENTER_H
 
+#include <stdint.h>
+
 //  Get a float value
 uint8_t  DIA_GetFloatValue(float *value, float min, float max, const char *title, const char *legend);
 //  Get an integer value
--- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_fileSel.h
+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_fileSel.h
@@ -15,6 +15,9 @@
 
 #ifndef DIA_FILESEL_H
 #define DIA_FILESEL_H
+
+#include <stdint.h>
+
 typedef void SELFILE_CB(const char *);
 
 // Associated functions type
--- avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
+++ avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
@@ -71,7 +71,7 @@
 */
 uint8_t fileParser::open( const char *filename,FP_TYPE *multi )
 {
-        char *dot = NULL;                   // pointer to the last dot in filename
+        const char *dot = NULL;             // pointer to the last dot in filename
         uint8_t decimals = 0;               // number of decimals
         char *left = NULL, *number = NULL, *right = NULL; // parts of filename (after splitting)
 
--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
+++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
@@ -104,7 +104,7 @@
 
 int y4m_parse_ratio(y4m_ratio_t *r, const char *s)
 {
-  char *t = strchr(s, ':');
+  const char *t = strchr(s, ':');
   if (t == NULL) return Y4M_ERR_RANGE;
   r->n = atoi(s);
   r->d = atoi(t+1);
--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
+++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
@@ -53,7 +53,7 @@
 
 bool LPCMStream::Probe(IBitStream &bs )
 {
-    char *last_dot = strrchr( bs.StreamName(), '.' );
+    const char *last_dot = strrchr( bs.StreamName(), '.' );
     return 
         last_dot != NULL 
         && strcmp( last_dot+1, "lpcm") == 0;
--- avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h
+++ avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h
@@ -1,6 +1,7 @@
 #ifndef T_threadCount_h
 #define T_threadCount_h
 
+#include <stdint.h>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QGridLayout>
 #include <QtGui/QLabel>
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h
@@ -18,6 +18,8 @@
 #ifndef ADM_TRAY_H
 #define ADM_TRAY_H
 
+#include <stdint.h>
+
 class ADM_tray
 {
 protected:
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <QtGui/QColorDialog>
 
 #include "ADM_toolkitQt.h"
@@ -17,4 +18,4 @@
     }
 
     return 0;
-}
\ No newline at end of file
+}
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h
@@ -1,6 +1,8 @@
 #ifndef Q_jobs_h
 #define Q_jobs_h
 
+#include <cstdio>
+#include <stdint.h>
 #include "ui_jobs.h"
 #include "ADM_misc.h"
 
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.h
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.h
@@ -1,6 +1,7 @@
 #ifndef Q_license_h
 #define Q_license_h
 
+#include <stdint.h>
 #include "ui_license.h"
 
 class Ui_licenseWindow : public QDialog
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
@@ -1,6 +1,9 @@
 #ifndef ADM_Q_SLIDER_H
 #define ADM_Q_SLIDER_H
 
+#include <cstdio>
+#include <stdint.h>
+
 class ADM_QSlider : public QSlider
 {
 protected:
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
@@ -8,6 +8,7 @@
 //
 //
 
+#include <stdint.h>
 #include "config.h"
 
 #include <QtGui/QApplication>

avidemux-plugins
PKGBUILD

pkgname=avidemux-plugins
pkgver=2.5.0
pkgrel=1
pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
arch=('i686' 'x86_64')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
depends=('libxv' 'libvorbis' 'libxml2' 'alsa-lib' 'lame' 'xvidcore' 'faad2>=2.7' 'faac' 'sdl' 'x264>=20090416' "avidemux=${pkgver}")
makedepends=('cmake' 'libxslt' 'gtk2' 'qt')
optdepends=('gtk2: for using the GTK GUI' 'qt: for using the QT4 GUI')
options=('!makeflags')
source=(${pkgname}_${pkgver}.tar.bz2
        avidemux-plugins-2.5.0-gcc-4.4.patch)
md5sums=('51ea7077624a54eca570890987d0d875'
         'c8a93c4bd599e4201794d41983d1b11b')

build() {
  cd ${srcdir}/${pkgname}_${pkgver}/plugins

  #Patch for gcc 4.4.x
  patch -Np2 -i "${srcdir}/avidemux-plugins-2.5.0-gcc-4.4.patch" || return 1

  mkdir build
  cd build

  cmake -DAVIDEMUX_LIB_DIR=/usr/lib -DAVIDEMUX_SOURCE_DIR=${srcdir}/${pkgname}_${pkgver} \
    -DAVIDEMUX_CORECONFIG_DIR=${srcdir}/${pkgname}_${pkgver}/build/config \
    -DAVIDEMUX_INSTALL_PREFIX=/usr  -D CMAKE_BUILD_TYPE=Release .. || return 1

  make || return 1
  make DESTDIR=${pkgdir} install || return 1

  #Move output from /usr/local/lib to /usr/lib
  cd ${pkgdir}/usr/local/lib
  cp -a ./ ${pkgdir}/usr/lib/
  cd ${pkgdir}/usr/
  rm -rf loc*
}

avidemux-plugins-2.5.0-gcc-4.4.patch

--- avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp
+++ avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp
@@ -62,8 +62,8 @@
 
 int x264_cqm_parse_jmlist(const char *buf, const char *name, uint8_t *cqm, uint8_t *defaultMatrix, int length)
 {
-    char *p;
-    char *nextvar;
+    const char *p;
+    const char *nextvar;
     int i;
 
     p = strstr(buf, name);
--- avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264CustomMatrixDialog.h
+++ avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264CustomMatrixDialog.h
@@ -1,6 +1,7 @@
 #ifndef x264CustomMatrixDialog_h
 #define x264CustomMatrixDialog_h
 
+#include <stdint.h>
 #include "ui_x264CustomMatrixDialog.h"
 
 class x264CustomMatrixDialog : public QDialog
--- avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/zoneOptions.h
+++ avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/zoneOptions.h
@@ -16,6 +16,8 @@
 
 #ifndef zoneOptions_h
 #define zoneOptions_h
+
+#include <stdint.h>
 
 extern "C"
 {
--- avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/options.h
+++ avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/options.h
@@ -17,6 +17,8 @@
 #ifndef options_h
 #define options_h
 
+#include <stdint.h>
+
 #include <libxml/tree.h>
 #include "xvid.h"
 
--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/AvisynthResize/qt4/Q_resize.h
+++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/AvisynthResize/qt4/Q_resize.h
@@ -1,6 +1,8 @@
 #ifndef Q_resizing_h
 #define Q_resizing_h
 
+#include <stdint.h>
+
 #include "ui_resizing.h"
 
 typedef struct resParam
--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/CNR2/ADM_vidCNR2_param.h
+++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/CNR2/ADM_vidCNR2_param.h
@@ -15,6 +15,8 @@
 #ifndef _CNR2_
 #define _CNR2_
 
+#include <stdint.h>
+
 typedef struct CNR2Param
 {
         double scdthr;          // Scene change threshold in % default 10
--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/colorYUV/ADM_vidColorYuv_param.h
+++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/colorYUV/ADM_vidColorYuv_param.h
@@ -14,6 +14,9 @@
 
 #ifndef ADM_VID_COLOR_YUV_PARAM_H
 #define ADM_VID_COLOR_YUV_PARAM_H
+
+#include <stdint.h>
+
 typedef struct COLOR_YUV_PARAM
 {
     double y_contrast, y_bright, y_gamma, y_gain;
--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MPDelogo/ADM_vidMPdelogo.h
+++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MPDelogo/ADM_vidMPdelogo.h
@@ -12,6 +12,9 @@
  ***************************************************************************/
 #ifndef ADM_DELOGO_H
 #define ADM_DELOGO_H
+
+#include <stdint.h>
+
 typedef struct MPDELOGO_PARAM
 {
         uint32_t xoff;
--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MPDelogo/DIA_flyMpDelogo.h
+++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MPDelogo/DIA_flyMpDelogo.h
@@ -1,5 +1,8 @@
 #ifndef FLY_MPDELOGO_H
 #define FLY_MPDELOGO_H
+
+#include <stdint.h>
+
 class flyMpDelogo : public FLY_DIALOG_TYPE
 {
 public:
--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MplayerResize/qt4/Q_resize.h
+++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MplayerResize/qt4/Q_resize.h
@@ -1,6 +1,8 @@
 #ifndef Q_resizing_h
 #define Q_resizing_h
 
+#include <stdint.h>
+
 #include "ui_resizing.h"
 
 typedef struct resParam

Last edited by wantilles (2009-07-17 00:45:34)

Offline

#6 2009-07-08 15:45:16

whaevr
Member
Registered: 2008-03-17
Posts: 182

Re: Proposed new avidemux 2.5.0 packages

Edit:
Nevermind for some reason that file wasn't patched.

It works!! big_smile

Edit2:
Idk if this is a bug with avidemux or what but it doesn't save any bitrate settings under x264...I could set it to encode 2 pass file size and when I open the x264 config again it'll be back on 1 pass quantizer mode.

It saves the rest of the settings for it except on that tab..

Last edited by whaevr (2009-07-08 22:58:31)

Offline

#7 2009-07-21 04:39:55

Snowman
Developer/Forum Fellow
From: Montreal, Canada
Registered: 2004-08-20
Posts: 5,212

Re: Proposed new avidemux 2.5.0 packages

avidemux-2.5.0-1 is in testing. It contains the plugins. Please test and report any problems.

Offline

#8 2009-07-21 07:25:00

wantilles
Member
From: Athens - Greece
Registered: 2007-03-29
Posts: 327

Re: Proposed new avidemux 2.5.0 packages

I am always trying to learn from more experienced users.

Eric Belanger thought of a clever way to build this thing with a single PKGBUILD.

Here:

build() {
  cd "${srcdir}/${pkgname}_${pkgver}"
  mkdir build
  cd build

<here he builds the core>

# 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

The "trick" is in the last line.

What I do not understand is, where (in which directory) are the symlinks made, and where do they point to?

Last edited by wantilles (2009-07-21 08:49:07)

Offline

#9 2009-07-21 07:50:08

Allan
Pacman
From: Brisbane, AU
Registered: 2007-06-09
Posts: 11,515
Website

Re: Proposed new avidemux 2.5.0 packages

From the code you posted, this creates a directory ${srcdir}/${pkgname}_${pkgver}/build/lib and places in it a symlink to all the libraries found in ${srcdir}/${pkgname}_${pkgver}/build/avidemux. 

Then the build of the plugins is told to look there for libraries to link to:
-D AVIDEMUX_INSTALL_PREFIX=${srcdir}/${pkgname}_${pkgver}/build

BTW, Eric = Snowman

PGP Key: F99FFE0FEAE999BD | I develop pacman - buy me a drink!

Offline

#10 2009-07-21 08:50:10

wantilles
Member
From: Athens - Greece
Registered: 2007-03-29
Posts: 327

Re: Proposed new avidemux 2.5.0 packages

Allan wrote:

BTW, Eric = Snowman

Oh.

I did not know that.

Sorry.

Snowman wrote:

avidemux-2.5.0-1 is in testing. It contains the plugins. Please test and report any problems.

So far so good.

Behaving normally.

Offline

#11 2009-07-21 16:38:04

Snowman
Developer/Forum Fellow
From: Montreal, Canada
Registered: 2004-08-20
Posts: 5,212

Re: Proposed new avidemux 2.5.0 packages

wantilles wrote:

I am always trying to learn from more experienced users.

Eric Belanger thought of a clever way to build this thing with a single PKGBUILD.

Here:

build() {
  cd "${srcdir}/${pkgname}_${pkgver}"
  mkdir build
  cd build

<here he builds the core>

# 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

The "trick" is in the last line.

What I do not understand is, where (in which directory) are the symlinks made, and where do they point to?

I can't take credit for this trick. It's from a PLF src.rpm I stumbled upon.  I'm also using a couple of their patches too.

I haven't mentionned it but the jack plugin doesn't get loaded because of symbol errors. I might be because I don't have jack setup, but judging from the error message I would doubt it. I would be great if someone using jack would test it.  I did some check on the plugins but I haven't found anything wrong with it. I found a runlog from someone using another distro and they got the same error so it could be an upstream bug.  As the avidemux in extra doesn't have jack support, it won't be a showstopper for moving 2.5.0 to extra.

Offline

Pages: 1

Board footer

Powered by FluxBB