[gstreamer-plugins-ugly] Remove sidplay for el
by Nicolas Chauvet
commit 21ac37024fbf2984f9d96a8d2a602511c5951c97
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jan 4 12:23:25 2017 +0100
Remove sidplay for el
gstreamer-plugins-ugly.spec | 3 ---
1 file changed, 3 deletions(-)
---
diff --git a/gstreamer-plugins-ugly.spec b/gstreamer-plugins-ugly.spec
index 33d1a2f..37fd094 100644
--- a/gstreamer-plugins-ugly.spec
+++ b/gstreamer-plugins-ugly.spec
@@ -25,9 +25,6 @@ BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
BuildRequires: gettext-devel
BuildRequires: gtk-doc
-%if 0%{?fedora} <= 17
-BuildRequires: libsidplay-devel >= 1.36.0
-%endif
BuildRequires: a52dec-devel >= 0.7.3
BuildRequires: libdvdread-devel >= 0.9.0
BuildRequires: lame-devel >= 3.89
7 years, 3 months
[gstreamer-plugins-ugly/el7] Remove sidplay for el
by Nicolas Chauvet
commit 8fedb5af6a060077943fc79d9baa6d9a4ede9fa3
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jan 4 12:23:25 2017 +0100
Remove sidplay for el
gstreamer-plugins-ugly.spec | 3 ---
1 file changed, 3 deletions(-)
---
diff --git a/gstreamer-plugins-ugly.spec b/gstreamer-plugins-ugly.spec
index e9379b1..2d59eda 100644
--- a/gstreamer-plugins-ugly.spec
+++ b/gstreamer-plugins-ugly.spec
@@ -24,9 +24,6 @@ BuildRequires: %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
BuildRequires: gettext-devel
BuildRequires: gtk-doc
-%if 0%{?fedora} <= 17
-BuildRequires: libsidplay-devel >= 1.36.0
-%endif
BuildRequires: a52dec-devel >= 0.7.3
BuildRequires: libdvdread-devel >= 0.9.0
BuildRequires: lame-devel >= 3.89
7 years, 3 months
[avidemux] Disable byte-compiling of python scrips as they are designed to be interpreted internally. Add bac
by Richard Shaw
commit 7bbfdc2a64954129aa390f76ab06d926ac601da3
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Jan 3 18:08:06 2017 -0600
Disable byte-compiling of python scrips as they are designed to be
interpreted internally.
Add backport fixes for filter preview windows, unbundle libmp4v2,
and enable eac3.
avidemux-2.6.16-filter-preview.patch | 379 ++++++++++++++++++++++++++++++++
avidemux-2.6.16-mp4muxer-eac3.patch | 25 +++
avidemux-2.6.16-unbundle-libmp4v2.patch | 102 +++++++++
avidemux.spec | 27 ++-
4 files changed, 526 insertions(+), 7 deletions(-)
---
diff --git a/avidemux-2.6.16-filter-preview.patch b/avidemux-2.6.16-filter-preview.patch
new file mode 100644
index 0000000..2ceae6a
--- /dev/null
+++ b/avidemux-2.6.16-filter-preview.patch
@@ -0,0 +1,379 @@
+commit b77bac1b214215eb30d86d426018e95d7b0231ce
+Author: mean <fixounet(a)free.fr>
+Date: Sun Jan 1 14:19:49 2017 +0100
+
+ [autoZoom] if unzooming make sure it is at least 1.5
+
+ avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+commit 1fcc43c2defde1fad7bfbba41b40ec00d0a0e868
+Author: mean <fixounet(a)free.fr>
+Date: Mon Jan 2 18:58:45 2017 +0100
+
+ [flyDialog] Begin to simplify zoom computation
+
+ avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h | 6 +-
+ avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp | 99 +++++++++++++++++++------
+ 2 files changed, 79 insertions(+), 26 deletions(-)
+commit 6803a6185e7f9abe529b6f7f05eae5b904c92407
+Author: mean <fixounet(a)free.fr>
+Date: Tue Jan 3 07:52:48 2017 +0100
+
+ [flyDialog] Tweak a bit more autozoom
+
+ avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp | 12 +++++++-----
+ .../qt4/ADM_userInterfaces/ADM_filters/seekablePreview.ui | 8 ++++----
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+commit befdc396c667c730cf0e91f3ce261369aee60e80
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Tue Jan 3 15:24:00 2017 +0100
+
+ [flyDialog] Fix navigation slider (WIP), add missing tooltips
+
+ avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h | 4 ++
+ avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp | 68 +++++++++++++++++++++----
+ 2 files changed, 61 insertions(+), 11 deletions(-)
+
+diff -uprN a/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h b/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h
+--- a/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h 2016-12-31 08:10:19.000000000 +0100
++++ b/avidemux/qt4/ADM_UIs/include/DIA_flyDialogQt4.h 2017-01-03 20:41:52.197003667 +0100
+@@ -81,7 +81,7 @@ class ADM_UIQT46_EXPORT ADM_flyDialog :
+ ResizeMethod _resizeMethod;
+ uint64_t lastPts;
+ double _computedZoom;
+-
++ int _usedWidth, _usedHeight;
+
+ ADM_coreVideoFilter *_in;
+
+@@ -117,7 +117,9 @@ protected:
+ virtual ADM_colorspace toRgbColor(void);
+ void updateZoom(void);
+ void EndConstructor(void);
+- uint8_t cleanup(void);
++ uint8_t cleanup(void);
++ bool initializeSize();
++ float calcZoomToBeDisplayable(uint32_t imageWidth, uint32_t imageHeight);
+ /* Filter dependant : you have to implement them*/
+ //
+ virtual void resetScaler(void)=0; // dont bother, implemented by yuv or rgb subclass
+@@ -143,7 +145,11 @@ public:
+ virtual void postInit(uint8_t reInit);
+ public:
+ virtual uint8_t sliderChanged(void);
++ virtual void updateSlider(void);
+ virtual bool goToTime(uint64_t tme);
++
++private:
++ virtual bool nextImageInternal(void);
+
+ public slots:
+ virtual bool nextImage(void);
+diff -uprN a/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp b/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp
+--- a/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp 2016-12-31 08:10:19.000000000 +0100
++++ b/avidemux/qt4/ADM_UIs/src/DIA_flyDialog.cpp 2017-01-03 20:41:52.197003667 +0100
+@@ -124,14 +124,18 @@ ADM_flyDialog::~ADM_flyDialog(void)
+ }
+
+ /**
+- \fn sliderChanged
+- \brief callback to handle image changes
++ \fn goToTime
+ */
+ bool ADM_flyDialog::goToTime(uint64_t tme)
+ {
+ _in->goToTime(tme);
+- return nextImage();
++ return nextImageInternal();
+ }
++
++/**
++ \fn sliderChanged
++ \brief callback to handle image changes
++*/
+ uint8_t ADM_flyDialog::sliderChanged(void)
+ {
+ uint32_t fn= sliderGet();
+@@ -205,9 +209,10 @@ bool ADM_flyDialog::addControl(QH
+ pushButton_back1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Back one minute", 0));
+ pushButton_back1mn->setText(QApplication::translate("seekablePreviewDialog", "<<", 0));
+ pushButton_play->setText(QApplication::translate("seekablePreviewDialog", "Play", 0));
+- pushButton_next->setStatusTip(QApplication::translate("seekablePreviewDialog", "next image", 0));
++ pushButton_next->setToolTip(QApplication::translate("seekablePreviewDialog", "Next image", 0));
+ pushButton_next->setText(QApplication::translate("seekablePreviewDialog", ">", 0));
+ pushButton_fwd1mn->setText(QApplication::translate("seekablePreviewDialog", ">>", 0));
++ pushButton_fwd1mn->setToolTip(QApplication::translate("seekablePreviewDialog", "Forward one minute", 0));
+ radioButton_autoZoom->setText(QApplication::translate("seekablePreviewDialog", "A&utoZoom", 0));
+
+ QObject::connect(pushButton_next ,SIGNAL(clicked()),this,SLOT(nextImage()));
+@@ -232,9 +237,9 @@ uint64_t ADM_flyDialog::getCurrentPts()
+ return lastPts;
+ }
+ /**
+- \fn nextImage
++ \fn nextImageInternal
+ */
+-bool ADM_flyDialog::nextImage(void)
++bool ADM_flyDialog::nextImageInternal(void)
+ {
+ uint32_t frameNumber;
+ if(!_in->getNextFrame(&frameNumber,_yuvBuffer))
+@@ -248,6 +253,88 @@ bool ADM_flyDialog::nextImage(void)
+ process();
+ return display(_rgbByteBufferDisplay.at(0));
+ }
++
++/**
++ \fn nextImage
++*/
++bool ADM_flyDialog::nextImage(void)
++{
++ QSlider *slide=(QSlider *)_slider;
++ ADM_assert(slide);
++ bool oldState=slide->blockSignals(true);
++ bool r=nextImageInternal();
++ if(r)
++ updateSlider();
++ slide->blockSignals(oldState);
++ return r;
++}
++
++/**
++ *
++ * @return
++ */
++bool ADM_flyDialog::initializeSize()
++{
++ _canvas->resize(1,1);
++ QSize qsize= _canvas->parentWidget()->parentWidget()->size();
++ //_usedWidth = qsize.width();
++ // Normally there is nothing interesting left and right, we can use a hardcoded value
++ _usedWidth=64;
++ _usedHeight= 32+qsize.height(); // keep a border margin
++
++ if (_resizeMethod != RESIZE_NONE)
++ {
++ _zoom = calcZoomFactor();
++ if (_zoom == 1)
++ {
++ _resizeMethod = RESIZE_NONE;
++ }
++ }
++ if (_resizeMethod == RESIZE_NONE)
++ {
++ _zoom = 1;
++ _zoomW = _w;
++ _zoomH = _h;
++ } else
++ {
++ _zoomW = uint32_t(_w * _zoom);
++ _zoomH = uint32_t(_h * _zoom);
++ }
++
++
++ ADM_info("xAutoZoom : base size= %d x %d\n",_usedWidth,_usedHeight);
++ return true;
++}
++/**
++ * \brief Calculate the zoom ratio required to fit the whole image on the screen.
++ * @param imageWidth
++ * @param imageHeight
++ * @return
++ */
++float ADM_flyDialog::calcZoomToBeDisplayable( uint32_t imageWidth, uint32_t imageHeight)
++{
++ uint32_t screenWidth, screenHeight;
++ QWidget *topWindow=_canvas->parentWidget()->parentWidget();
++ UI_getPhysicalScreenSize(topWindow, &screenWidth, &screenHeight);
++
++ // Usable width/height
++ int usableWidth =(int)screenWidth -_usedWidth;
++ int usableHeight=(int)screenHeight-_usedHeight;
++
++ if(usableWidth<160) usableWidth=160;
++ if(usableHeight<160) usableHeight=160;
++
++
++ float widthRatio = (float)usableWidth / (float)imageWidth;
++ float heightRatio = (float)usableHeight / (float)imageHeight;
++
++ ADM_info("autoZoom : Raw w=%f h=%f\n",widthRatio,heightRatio);
++
++ float r= (widthRatio < heightRatio ? widthRatio : heightRatio);
++ return r;
++
++}
++
+ //************************************
+ // Implement the specific part
+ // i.e. yuv processing or RGB processing
+@@ -258,6 +345,7 @@ bool ADM_flyDialog::nextImage(void)
+ {
+ _yuvBufferOut=new ADMImageDefault(_w,_h);
+ yuvToRgb=NULL;
++ initializeSize();
+ updateZoom();
+ postInit(false);
+ }
+@@ -294,6 +382,7 @@ ADM_flyDialogRgb::ADM_flyDialogRgb(QDial
+ yuv2rgb =new ADMColorScalerSimple(_w,_h,ADM_COLOR_YV12,
+ toRgbColor());
+ rgb2rgb=NULL;
++ initializeSize();
+ updateZoom();
+ postInit(false);
+
+@@ -335,7 +424,8 @@ bool ADM_flyDialogRgb::process(void)
+ return true;
+ }
+
+-extern float UI_calcZoomToFitScreen(QWidget* window, QWidget* canvas, uint32_t imageWidth, uint32_t imageHeight);
++
++
+
+ /**
+ \fn FlyDialogEventFilter
+@@ -377,9 +467,10 @@ bool FlyDialogEventFilter::eventFilter(Q
+ ADM_QCanvas *canvas, QSlider *slider, ResizeMethod resizeMethod)
+ {
+ ADM_assert(canvas);
+-
+- if (slider)
+- ADM_assert(in);
++ {
++ ADM_assert(in);
++ slider->setMaximum(ADM_FLY_SLIDER_MAX);
++ }
+ _parent=parent;
+ _w = width;
+ _h = height;
+@@ -391,25 +482,9 @@ bool FlyDialogEventFilter::eventFilter(Q
+ _resizeMethod = resizeMethod;
+ _zoomChangeCount = 0;
+ _yuvBuffer=new ADMImageDefault(_w,_h);
++ _usedWidth= _usedHeight=0;
+ lastPts=0;
+- if (_resizeMethod != RESIZE_NONE)
+- {
+- _zoom = calcZoomFactor();
+- if (_zoom == 1)
+- {
+- _resizeMethod = RESIZE_NONE;
+- }
+- }
+- if (_resizeMethod == RESIZE_NONE)
+- {
+- _zoom = 1;
+- _zoomW = _w;
+- _zoomH = _h;
+- } else
+- {
+- _zoomW = uint32_t(_w * _zoom);
+- _zoomH = uint32_t(_h * _zoom);
+- }
++
+
+ connect(&timer,SIGNAL(timeout()),this,SLOT(timeout()));
+ timer.setSingleShot(true);
+@@ -451,22 +526,22 @@ void ADM_flyDialog::postInit(uint8_t reI
+ \fn calcZoomFactor
+ \brief
+ */
+-
+ float ADM_flyDialog::calcZoomFactor(void)
+ {
++#define APPROXIMATE 20.
+ if(_computedZoom) return _computedZoom;
+ double zoom;
+- zoom=UI_calcZoomToFitScreen(((ADM_QCanvas*)_canvas)->parentWidget()->parentWidget(), ((ADM_QCanvas*)_canvas)->parentWidget(), _w, _h);
++ zoom=calcZoomToBeDisplayable(_w, _h);
+ // Find the closest integer
+ // zoom it ?
+- if((zoom+0.3)>1)
++ if((zoom)>1)
+ {
+- _computedZoom=floor(2*(zoom+0.3))/2;
++ _computedZoom=floor(APPROXIMATE*(zoom))/APPROXIMATE;
+ ADM_info("AutoZoom %f ->%f \n",(float)zoom,(float)_computedZoom);
+ return _computedZoom;
+ }
+ double invertZoom=1/zoom;
+- _computedZoom=2./floor((2*(invertZoom+0.3)));
++ _computedZoom=APPROXIMATE/floor((1+APPROXIMATE*(invertZoom)));
+ ADM_info("AutoZoom 1/%f\n",(float)(1./_computedZoom));
+ return _computedZoom;
+
+@@ -513,6 +588,24 @@ uint8_t ADM_flyDialog::sliderSet(uin
+ slide->setValue(value);
+ return 1;
+ }
++
++/**
++ \fn updateSlider
++ \brief
++*/
++void ADM_flyDialog::updateSlider(void)
++{
++ ADM_assert(_in);
++ uint64_t dur=_in->getInfo()->totalDuration;
++ uint64_t pts=getCurrentPts();
++ double pos;
++ pos=pts;
++ pos/=dur;
++ pos*=ADM_FLY_SLIDER_MAX;
++ pos+=0.5; // round up
++ sliderSet((uint32_t)pos);
++}
++
+ /**
+ \fn isRgbInverted
+ \brief
+@@ -534,6 +627,7 @@ void ADM_flyDialog::backOneMinute(void)
+ if(pts<JUMP_LENGTH) pts=0;
+ else pts-=JUMP_LENGTH;
+ goToTime(pts);
++ updateSlider();
+ }
+ /**
+ *
+@@ -543,18 +637,21 @@ void ADM_flyDialog::fwdOneMinute(void)
+ uint64_t pts=getCurrentPts();
+ pts+=JUMP_LENGTH;
+ goToTime(pts);
+-
++ updateSlider();
+ }
+ /**
+ *
+ */
+ void ADM_flyDialog::play(bool state)
+ {
++ QSlider *slide=(QSlider *)_slider;
++ ADM_assert(slide);
+ if(state)
+ {
+ pushButton_back1mn->setEnabled(false);
+ pushButton_fwd1mn->setEnabled(false);
+ pushButton_next->setEnabled(false);
++ slide->setEnabled(false);
+ timer.start();
+ }else
+ {
+@@ -562,6 +659,8 @@ void ADM_flyDialog::play(bool state)
+ pushButton_back1mn->setEnabled(true);
+ pushButton_fwd1mn->setEnabled(true);
+ pushButton_next->setEnabled(true);
++ updateSlider();
++ slide->setEnabled(true);
+ }
+
+ }
+@@ -589,7 +688,7 @@ void ADM_flyDialog::autoZoom(bool state)
+ void ADM_flyDialog::timeout()
+ {
+
+- bool r=nextImage();
++ bool r=nextImageInternal();
+ if(r)
+ {
+ timer.start();
diff --git a/avidemux-2.6.16-mp4muxer-eac3.patch b/avidemux-2.6.16-mp4muxer-eac3.patch
new file mode 100644
index 0000000..0abe5b0
--- /dev/null
+++ b/avidemux-2.6.16-mp4muxer-eac3.patch
@@ -0,0 +1,25 @@
+commit fbb1eb67f11dd35decd75ee295feee22a8340a2c
+Author: mean <fixounet(a)free.fr>
+Date: Tue Jan 3 19:17:39 2017 +0100
+
+ [MP4/muxer] Allow eac3 (fiftyplus)
+---
+ avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp b/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp
+index 952cf42..192bff3 100644
+--- a/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp
++++ b/avidemux_plugins/ADM_muxers/muxerMp4/muxerMP4.cpp
+@@ -68,9 +68,9 @@ bool muxerMP4::open(const char *file, ADM_videoStream *s,uint32_t nbAudioTrack,A
+ for(int i=0;i<nbAudioTrack;i++)
+ {
+ uint32_t acc=a[i]->getInfo()->encoding;
+- if(acc!=WAV_MP2 && acc!=WAV_MP3 && acc!=WAV_AAC && acc!=WAV_AC3)
++ if(acc!=WAV_MP2 && acc!=WAV_MP3 && acc!=WAV_AAC && acc!=WAV_AC3 && acc!=WAV_EAC3)
+ {
+- GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4muxer","Unsupported"),QT_TRANSLATE_NOOP("mp4muxer","Only AAC, AC3, and mpegaudio supported for audio"));
++ GUI_Error_HIG(QT_TRANSLATE_NOOP("mp4muxer","Unsupported"),QT_TRANSLATE_NOOP("mp4muxer","Only AAC, AC3, E-AC3 and mpegaudio supported for audio"));
+ return false;
+ }
+ }
diff --git a/avidemux-2.6.16-unbundle-libmp4v2.patch b/avidemux-2.6.16-unbundle-libmp4v2.patch
new file mode 100644
index 0000000..dc62b24
--- /dev/null
+++ b/avidemux-2.6.16-unbundle-libmp4v2.patch
@@ -0,0 +1,102 @@
+commit aea8957dd42ec3ce83a921a2317e361c5a72b874
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Tue Jan 3 22:16:58 2017 +0100
+
+ [build/plugins] Allow system libmp4v2
+---
+ avidemux_plugins/ADM_muxers/muxerMp4v2/CMakeLists.txt | 12 +++++++++---
+ avidemux_plugins/CMakeLists.txt | 8 ++++++++
+ bootStrap.bash | 8 ++++++++
+ 3 files changed, 25 insertions(+), 3 deletions(-)
+
+diff --git a/avidemux_plugins/ADM_muxers/muxerMp4v2/CMakeLists.txt b/avidemux_plugins/ADM_muxers/muxerMp4v2/CMakeLists.txt
+index 55639ed..c2139de 100644
+--- a/avidemux_plugins/ADM_muxers/muxerMp4v2/CMakeLists.txt
++++ b/avidemux_plugins/ADM_muxers/muxerMp4v2/CMakeLists.txt
+@@ -6,11 +6,17 @@ SET(ADM_mp4v2_SRCS
+ muxerMp4v2Video.cpp
+ muxerMp4v2Config.cpp
+ )
+-SUBDIRS(libmp4v2)
++IF(NOT USE_EXTERNAL_MP4V2)
++ ADD_SUBDIRECTORY(libmp4v2)
++ENDIF()
+
+ ADD_LIBRARY(ADM_mx_mp4v2 SHARED ${ADM_mp4v2_SRCS})
+-TARGET_LINK_LIBRARIES(ADM_mx_mp4v2 ADM_libmp4v2)
++IF(USE_EXTERNAL_MP4V2)
++ TARGET_LINK_LIBRARIES(ADM_mx_mp4v2 ${MP4V2_LIBRARIES})
++ELSE()
++ TARGET_LINK_LIBRARIES(ADM_mx_mp4v2 ADM_libmp4v2)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libmp4v2/include/)
++ENDIF()
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libmp4v2/include/)
+ INIT_MUXER(ADM_mx_mp4v2)
+ INSTALL_MUXER(ADM_mx_mp4v2)
+diff --git a/avidemux_plugins/CMakeLists.txt b/avidemux_plugins/CMakeLists.txt
+index 272f786..9650db5 100644
+--- a/avidemux_plugins/CMakeLists.txt
++++ b/avidemux_plugins/CMakeLists.txt
+@@ -70,6 +70,7 @@ INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6")
+ OPTION(USE_EXTERNAL_LIBASS "Use system installed libass library." OFF)
+ OPTION(USE_EXTERNAL_LIBMAD "Use system installed libmad library." OFF)
+ OPTION(USE_EXTERNAL_LIBA52 "Use system installed liba52 library." OFF)
++OPTION(USE_EXTERNAL_MP4V2 "Use system installed libmp4v2 library." OFF)
+
+ INCLUDE(FindPkgConfig)
+
+@@ -93,6 +94,13 @@ IF(USE_EXTERNAL_LIBA52)
+ INCLUDE_DIRECTORIES(SYSTEM ${LIBA52_INCLUDE_DIR})
+ ENDIF()
+
++# libmp4v2
++IF(USE_EXTERNAL_MP4V2)
++ FIND_PATH(MP4V2_INCLUDE_DIR mp4v2/mp4v2.h)
++ FIND_LIBRARY(MP4V2_LIBRARIES mp4v2)
++ INCLUDE_DIRECTORIES(SYSTEM ${MP4V2_INCLUDE_DIR})
++ENDIF()
++
+ IF (FRESH_BUILD)
+ MESSAGE("")
+ ENDIF (FRESH_BUILD)
+diff --git a/bootStrap.bash b/bootStrap.bash
+index 86810d1..7d21b61 100644
+--- a/bootStrap.bash
++++ b/bootStrap.bash
+@@ -26,6 +26,7 @@ fi
+ external_libass=0
+ external_liba52=0
+ external_libmad=0
++external_libmp4v2=0
+
+ fail()
+ {
+@@ -120,6 +121,7 @@ usage()
+ echo " --with-system-libass : Use system libass instead of the bundled one"
+ echo " --with-system-liba52 : Use system liba52 (a52dec) instead of the bundled one"
+ echo " --with-system-libmad : Use system libmad instead of the bundled one"
++ echo " --with-system-libmp4v2: Use system libmp4v2 instead of the bundled one"
+ echo "The end result will be in the install folder. You can then copy it to / or whatever"
+ config
+
+@@ -239,6 +241,9 @@ while [ $# != 0 ] ;do
+ --with-system-libmad)
+ external_libmad=1
+ ;;
++ --with-system-libmp4v2)
++ external_libmp4v2=1
++ ;;
+ *)
+ echo "unknown parameter $config_option"
+ usage
+@@ -263,6 +268,9 @@ fi
+ if [ "x$external_libmad" = "x1" ]; then
+ export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_LIBMAD=true $EXTRA_CMAKE_DEFS"
+ fi
++if [ "x$external_libmp4v2" = "x1" ]; then
++ export EXTRA_CMAKE_DEFS="-DUSE_EXTERNAL_MP4V2=true $EXTRA_CMAKE_DEFS"
++fi
+ echo "Top dir : $TOP"
+ echo "Fake installation directory=$FAKEROOT_DIR"
+ if [ "x$debug" = "x1" ] ; then echo
diff --git a/avidemux.spec b/avidemux.spec
index 085c24b..e34f489 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -5,7 +5,7 @@
Name: avidemux
Version: 2.6.16
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -14,6 +14,9 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.
Source1: avidemux-qt.desktop
Patch0: avidemux-2.6.15-disable-vpx-decoder-plugin.patch
+Patch1: avidemux-2.6.16-filter-preview.patch
+Patch2: avidemux-2.6.16-unbundle-libmp4v2.patch
+Patch3: avidemux-2.6.16-mp4muxer-eac3.patch
# Don't try to build on arm
ExcludeArch: %{arm}
@@ -37,6 +40,7 @@ BuildRequires: libXv-devel
BuildRequires: libXmu-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libass-devel
+BuildRequires: libmp4v2-devel
# Sound out
BuildRequires: alsa-lib-devel >= 1.0.3
@@ -119,12 +123,15 @@ This package contains translation files for %{name}.
%prep
%setup -q -n %{name}_%{version}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad \
- avidemux_plugins/ADM_audioEncoders/twolame/ADM_libtwolame \
- avidemux_plugins/ADM_videoFilters6/ass/ADM_libass
+ avidemux_plugins/ADM_videoFilters6/ass/ADM_libass \
+ avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2
%build
# Build avidemux_core
@@ -168,7 +175,7 @@ rm -rf build_plugins_common && mkdir build_plugins_common && pushd build_plugins
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
-DUSE_EXTERNAL_LIBA52=TRUE \
- -DUSE_EXTERNAL_TWOLAME=TRUE \
+ -DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
make %{?_smp_mflags}
make install DESTDIR=%{_pkgbuilddir}/fakeRoot
@@ -184,7 +191,7 @@ rm -rf build_plugins_cli && mkdir build_plugins_cli && pushd build_plugins_cli
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
-DUSE_EXTERNAL_LIBA52=TRUE \
- -DUSE_EXTERNAL_TWOLAME=TRUE \
+ -DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
make %{?_smp_mflags}
make install DESTDIR=%{_pkgbuilddir}/fakeRoot
@@ -200,7 +207,7 @@ rm -rf build_plugins_qt5 && mkdir build_plugins_qt5 && pushd build_plugins_qt5
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
-DUSE_EXTERNAL_LIBA52=TRUE \
- -DUSE_EXTERNAL_TWOLAME=TRUE \
+ -DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
make %{?_smp_mflags}
make install DESTDIR=%{_pkgbuilddir}/fakeRoot
@@ -230,7 +237,7 @@ desktop-file-install --vendor rpmfusion \
install -pDm 0644 avidemux/gtk/ADM_userInterfaces/glade/main/avidemux_icon_small.png \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/avidemux.png
install -pDm 0644 avidemux_icon.png \
- %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
+ %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
# Fix library permissions
find %{buildroot}%{_libdir} -type f -name "*.so.*" -exec chmod 0755 {} \;
@@ -299,6 +306,12 @@ fi
%changelog
+* Tue Jan 3 2017 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.16-3
+- Disable byte-compiling of python scrips as they are designed to be
+ interpreted internally.
+- Add backport fixes for filter preview windows, unbundle libmp4v2,
+ and enable eac3.
+
* Tue Jan 03 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 2.6.16-2
- rebuild for x265
7 years, 3 months
[obs-studio/f25: 2/2] Updated to 17.0.0
by Momcilo Medic
commit 480f9e629282edf9a72cc2349095341766097870
Merge: 26106c3 3410765
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Tue Jan 3 22:57:42 2017 +0100
Updated to 17.0.0
.gitignore | 1 +
obs-ffmpeg-mux.patch | 26 --------------------------
obs-studio.spec | 9 ++++++---
sources | 2 +-
4 files changed, 8 insertions(+), 30 deletions(-)
---
7 years, 3 months
[obs-studio/f24] Updated to 17.0.0
by Momcilo Medic
Summary of changes:
3410765... Updated to 17.0.0 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 3 months
[obs-studio] Updated to 17.0.0
by Momcilo Medic
commit 3410765bfb74e9892d9f53964f4b17fbd76718c2
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Tue Jan 3 22:56:09 2017 +0100
Updated to 17.0.0
.gitignore | 1 +
obs-ffmpeg-mux.patch | 26 --------------------------
obs-studio.spec | 9 ++++++---
sources | 2 +-
4 files changed, 8 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d451258..40caee6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/obs-studio-4505d5ac33b6c5d4bb828dd62b027452a6ac262d.tar.gz
/obs-studio-0.16.5.tar.gz
/obs-studio-0.16.6.tar.gz
+/obs-studio-17.0.0.tar.gz
diff --git a/obs-studio.spec b/obs-studio.spec
index 35fc9cf..8abdaa7 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,12 +1,11 @@
Name: obs-studio
-Version: 0.16.6
+Version: 17.0.0
Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
URL: https://obsproject.com/
Source0: https://github.com/jp9000/obs-studio/archive/%{version}.tar.gz#/%{name}-%...
-Patch0: obs-ffmpeg-mux.patch
# Arm gcc has no xmmintrin.h file
ExclusiveArch: i686 x86_64
@@ -66,7 +65,6 @@ that use %{name}.
%prep
%setup -q
-%patch0 -p1
# rpmlint reports E: hardcoded-library-path
# replace OBS_MULTIARCH_SUFFIX by LIB_SUFFIX
@@ -131,6 +129,11 @@ fi
%changelog
+* Tue Jan 03 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 17.0.0-1
+- Upstream fixed arch-dependent-file-in-usr-share
+- Removed obs-ffmpeg-mux.patch
+- Updated to 17.0.0
+
* Sun Nov 27 2016 Momcilo Medic <fedorauser(a)fedoraproject.org> - 0.16.6-1
- Updated to 0.16.6
diff --git a/sources b/sources
index afedccd..290f81c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d572fc692b75aca07bd0aa6ef008289 obs-studio-0.16.6.tar.gz
+44ee6551d37de3cc8f306252f2139829 obs-studio-17.0.0.tar.gz
7 years, 3 months
[vlc/el7] merge of f23 vlc 2.2x
by Nicolas Chauvet
commit 2340c05c5b01d60ab4e2ef0fbf9725cdd1c84817
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jan 3 17:52:42 2017 +0100
merge of f23 vlc 2.2x
.gitignore | 2 +-
sources | 2 +-
vlc.spec | 141 ++++++++++++++++++++++++++++++++++++++-----------------------
3 files changed, 89 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5eb81d5..6d32910 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-vlc-2.1.6.tar.xz
+vlc-*.tar.xz
diff --git a/sources b/sources
index 0048b3f..4ddc118 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6de050559fbb1456b35303f04705145d vlc-2.1.6.tar.xz
+55666c9898f658c7fcca12725bf7dd1b vlc-2.2.4.tar.xz
diff --git a/vlc.spec b/vlc.spec
index e68f406..d1186fb 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,44 +1,42 @@
-#global vlc_rc -rc1
+#global vlc_rc -pre20151006
%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
-%global _with_a52dec --with-a52dec
-%global _with_faad2 --with-faad2
-%global _with_ffmpeg --with-ffmpeg
-%global _with_libdca --with-libdca
-%global _with_libdvbpsi --with-libdvbpsi
-%global _with_libmad --with-libmad
-%global _with_libmpeg2 --with-libmpeg2
-%global _with_twolame --with-twolame
-%global _with_x264 --with-x264
-%global _with_xvidcore --with-xvidcore
-%global _with_live555 --with-live555
-%global _with_vaapi --with-vaapi
+%global _with_a52dec 1
+%global _with_faad2 1
+%global _with_ffmpeg 1
+%global _with_libdca 1
+%global _with_libdvbpsi 1
+%global _with_libmad 1
+%global _with_libmpeg2 1
+%global _with_twolame 1
+%global _with_x264 1
+%global _with_x265 1
+%global _with_xvidcore 1
+%global _with_live555 1
+%global _with_vaapi 1
%endif
-%if 0%{?fedora}
-%global _with_fluidsynth 1
%global _with_bluray 1
%global _with_opencv 1
-%ifarch x86_64 i686
-%global _with_crystalhd 1
-%endif
+%global _with_fluidsynth 1
+%if 0%{?fedora}
+%global _with_freerdp 1
%global _with_projectm 1
%global _with_schroedinger 1
%endif
-%if 0%{?fedora} < 21
-%global _with_freerdp 1
+%ifarch x86_64 i686
+%global _with_crystalhd 1
%endif
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.1.6
-Release: 2%{?dist}
+Version: 2.2.4
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -53,7 +51,6 @@ BuildRequires: alsa-lib-devel
BuildRequires: avahi-devel
BuildRequires: cdparanoia-devel
BuildRequires: pkgconfig(dbus-1)
-BuildRequires: dirac-devel >= 1.0.0
%{?_with_faad2:BuildRequires: faad2-devel}
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0}
BuildRequires: flac-devel
@@ -113,7 +110,9 @@ BuildRequires: lirc-devel
BuildRequires: kernel-headers
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glu)
+%if 0%{?fedora} < 24
BuildRequires: libmusicbrainz-devel
+%endif
BuildRequires: libsamplerate-devel
BuildRequires: libshout-devel
BuildRequires: lua-devel
@@ -135,6 +134,7 @@ BuildRequires: taglib-devel
%{?_with_twolame:BuildRequires: twolame-devel}
%{?_with_vcdimager:BuildRequires: vcdimager-devel >= 0.7.21}
%{?_with_x264:BuildRequires: x264-devel >= 0-0.8.20061028}
+%{?_with_x265:BuildRequires: x265-devel}
%{?_with_xvidcore:BuildRequires: xvidcore-devel}
BuildRequires: zlib-devel
BuildRequires: zvbi-devel
@@ -194,9 +194,6 @@ Summary: VLC media player core
Group: Applications/Multimedia
Provides: vlc-nox = %{version}-%{release}
Obsoletes: vlc-nox < 1.1.5-2
-#Deprecated since F-19, can be dropped by F-21/EL-7
-%{?live555date:Requires: live555date%{_isa} = %{live555date}}
-#Introduced in F-19
%{?live555_version:Requires: live555%{?_isa} = %{live555_version}}
%description core
@@ -222,18 +219,24 @@ JACK audio plugin for the VLC media player.
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc}
-
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
}
+
%build
%configure \
--disable-dependency-tracking \
+ --disable-optimizations \
+%if 0%{?fedora} >= 22
+%ifarch i686
+ --disable-mmx --disable-sse \
+%endif
+%endif
--disable-silent-rules \
--with-pic \
--disable-rpath \
@@ -246,10 +249,12 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
%{?_with_gnomevfs:--enable-gnomevfs} \
%{?_with_vcdimager:--enable-vcdx} \
--enable-omxil \
-%ifarch armv5tel armv6l armv6hl
--enable-omxil-vout \
+%{?_with_rpi:
--enable-rpi-omxil \
-%endif
+ --enable-mmal-codec \
+ --enable-mmal-vout \
+} \
%{!?_with_a52dec:--disable-a52} \
%{!?_with_ffmpeg:--disable-avcodec --disable-avformat \
--disable-swscale --disable-postproc} \
@@ -261,7 +266,6 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
--enable-tremor \
--enable-speex \
--enable-theora \
- --enable-dirac \
--enable-libass \
--enable-shout \
%{!?_without_xcb:--enable-xcb --enable-xvideo} \
@@ -272,10 +276,7 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
--enable-jack \
--enable-pulse \
--enable-ncurses \
- --enable-lirc \
-%if 0%{?fedora} < 19
- --disable-vdpau \
-%endif
+ --enable-lirc
%if 0
@@ -295,8 +296,6 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
@@ -324,10 +323,6 @@ touch $RPM_BUILD_ROOT%{_libdir}/vlc/plugins.dat
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc &>/dev/null
touch --no-create %{_datadir}/icons/hicolor
@@ -378,7 +373,6 @@ fi || :
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/kde4/apps/solid/actions/vlc-*.desktop
@@ -395,14 +389,11 @@ fi || :
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{!?_without_xcb:
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
-%if 0%{?fedora} < 17
-%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
-%endif
%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-%{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
+#{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
}
%{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_projectm:
@@ -411,7 +402,6 @@ fi || :
%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
%files core -f %{name}.lang
-%defattr(-,root,root,-)
%{_bindir}/vlc
%{_bindir}/cvlc
%{_bindir}/nvlc
@@ -447,7 +437,7 @@ fi || :
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
-%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
+#{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
}
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_opencv:
@@ -464,7 +454,6 @@ fi || :
%{_mandir}/man1/vlc*.1*
%files plugin-jack
-%defattr(-,root,root,-)
%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
%{?_with_fluidsynth:
@@ -472,7 +461,6 @@ fi || :
}
%files extras
-%defattr(-,root,root,-)
%{?_with_opencv:
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
@@ -487,7 +475,6 @@ fi || :
}
%files devel
-%defattr(-,root,root,-)
%dir %{_includedir}/vlc
%{_includedir}/vlc/*
%{_libdir}/*.so
@@ -497,12 +484,58 @@ fi || :
%changelog
-* Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1.6-2
+* Mon Jun 06 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.4-1
+- Update to 2.2.4
+
+* Wed May 04 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.3-1
+- Update to 2.2.3
+
+* Sat Feb 06 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.2-1
+- Update to 2.2.2
+
+* Tue Oct 06 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.2-0.1
+- Update to 2.2.2 pre-version
+
+* Sat May 16 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.1-6
+- Rebuilt for x265
+
+* Wed May 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.1-5
+- Update to current bugfix
+
+* Sat May 09 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.1-4
- Recreate the plugins cache on post for main - rfbz#3639
- %%ghost the cache plugins
-* Fri Apr 03 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1.6-1
-- Update to 2.1.6
+* Sun Apr 26 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.1-3
+- Fix build with freerdp for f22
+- Disable optimizations
+- Disable mmx and sse on fedora >= 22
+
+* Thu Apr 16 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.1-2
+- Rebuilt for x265
+
+* Mon Apr 13 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.1-1
+- Update to 2.2.1
+- Enable x265 on armhfp
+- Add --with rpi conditional for raspberrypi and mmal
+
+* Fri Feb 27 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.0-1
+- Update to 2.2.0
+
+* Tue Nov 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.0-0.2
+- Update to 2.2.0-rc2
+
+* Fri Nov 14 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.0-0.1
+- Update to 2.2.0-rc1
+
+* Sun Sep 28 2014 kwizart <kwizart(a)gmail.com> - 2.1.5-4
+- Allow build with ffmpeg24
+
+* Fri Sep 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1.5-3
+- Rebuilt for FFmpeg 2.4.x
+
+* Thu Aug 07 2014 Sérgio Basto <sergio(a)serjux.com> - 2.1.5-2
+- Rebuilt for ffmpeg-2.3
* Sat Jul 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1.5-1
- Update to 2.1.5
7 years, 3 months