rpmfusion-commits
October 2012
rpmfusion-commits@lists.rpmfusion.org
- 26 participants
- 402 discussions
rpms/avidemux/devel avidemux-2.6-bundled_libs.patch, NONE, 1.1 avidemux-2.6-use_external_libass.patch, NONE, 1.1 avidemux3-bundled_libs.patch, NONE, 1.1 avidemux3-glu_fix.patch, NONE, 1.1 avidemux3-libass.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 avidemux-gtk.desktop, 1.4, 1.5 avidemux-qt.desktop, 1.4, 1.5 avidemux.spec, 1.67, 1.68 sources, 1.10, 1.11 2.5.0-coreImage-parallel-build.patch, 1.1, NONE 2.5.3_mjpeg_fix.diff, 1.1, NONE avidemux-2.4-qt4.patch, 1.1, NONE avidemux-2.5-libmpeg2enc-altivec.patch, 1.1, N
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1138
Modified Files:
.cvsignore avidemux-gtk.desktop avidemux-qt.desktop
avidemux.spec sources
Added Files:
avidemux-2.6-bundled_libs.patch
avidemux-2.6-use_external_libass.patch
avidemux3-bundled_libs.patch avidemux3-glu_fix.patch
avidemux3-libass.patch
Removed Files:
2.5.0-coreImage-parallel-build.patch 2.5.3_mjpeg_fix.diff
avidemux-2.4-qt4.patch avidemux-2.5-libmpeg2enc-altivec.patch
avidemux-2.5-pulseaudio-default.patch
avidemux-2.5.3-mpeg2enc.patch avidemux-2.5.3-pluginlibs.patch
avidemux-2.5.3-tmplinktarget.patch avidemux-2.5.4-liba52.patch
avidemux-2.5.4-libass.patch avidemux-2.5.4-libmad.patch
avidemux-2.5.4-libtwolame.patch
avidemux-2.5.5-gcc46_tmp_fix.patch
avidemux-2.5.5-x264_i_to_b_open_gop.patch
avidemux-2.5.5_fix_lav_audio_encoder.patch
avidemux-2.5.6-ffmpeg_aac.patch
avidemux-2.5.6-ffmpeg_parallel_build.patch
avidemux_2.5.5-ffmpeg_aac.patch
Log Message:
* Sun Oct 14 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-1
- Update to new upstream release.
avidemux-2.6-bundled_libs.patch:
CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
--- NEW FILE avidemux-2.6-bundled_libs.patch ---
diff -Naur avidemux_2.6.0.orig/avidemux_plugins/CMakeLists.txt avidemux_2.6.0/avidemux_plugins/CMakeLists.txt
--- avidemux_2.6.0.orig/avidemux_plugins/CMakeLists.txt 2012-07-13 02:50:08.000000000 -0500
+++ avidemux_2.6.0/avidemux_plugins/CMakeLists.txt 2012-09-14 14:57:05.767002527 -0500
@@ -37,6 +37,40 @@
LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6")
+#########################################
+# Unbundle some libraries here
+#########################################
+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_LIBTWOLAME "Use system installed libtwolame library." OFF)
+
+INCLUDE(FindPkgConfig)
+
+# libass
+IF(USE_EXTERNAL_LIBASS)
+ PKG_CHECK_MODULES(LIBASS REQUIRED libass)
+ INCLUDE_DIRECTORIES(SYSTEM ${LIBASS_INCLUDE_DIRS})
+ENDIF()
+
+# libmad
+IF(USE_EXTERNAL_LIBMAD)
+ PKG_CHECK_MODULES(LIBMAD REQUIRED mad)
+ INCLUDE_DIRECTORIES(SYSTEM ${LIBMAD_INCLUDE_DIRS})
+ENDIF()
+
+# liba52
+IF(USE_EXTERNAL_LIBA52)
+ FIND_PATH(LIBA52_INCLUDE_DIR a52dec/a52.h)
+ FIND_LIBRARY(LIBA52_LIBRARIES a52)
+ INCLUDE_DIRECTORIES(SYSTEM ${LIBA52_INCLUDE_DIR})
+ENDIF()
+
+# twolame
+IF(USE_EXTERNAL_TWOLAME)
+ PKG_CHECK_MODULES(LIBTWOLAME REQUIRED twolame)
+ INCLUDE_DIRECTORIES(SYSTEM ${LIBTWOLAME_INCLUDE_DIRS})
+ENDIF()
IF (FRESH_BUILD)
MESSAGE("")
avidemux-2.6-use_external_libass.patch:
ADM_videoFilters6/ass/CMakeLists.txt | 8 +++++++-
CMakeLists.txt | 16 +++++++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
--- NEW FILE avidemux-2.6-use_external_libass.patch ---
diff -Naur snapshot_7732.orig/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt snapshot_7732/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
--- snapshot_7732.orig/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2012-01-28 20:02:45.000000000 -0600
+++ snapshot_7732/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2012-01-31 12:52:29.573651021 -0600
@@ -10,7 +10,13 @@
ADD_VIDEO_FILTER(ADM_vf_ssa ${ADM_vf_ssa_SRCS})
IF(DO_COMMON)
- TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS})
+ IF(USE_EXTERNAL_LIBASS)
+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES}
+ ${FREETYPE2_LDFLAGS})
+ ELSE(USE_EXTERNAL_LIBASS)
+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass
+ ${FREETYPE2_LDFLAGS})
+ ENDIF(USE_EXTERNAL_LIBASS)
IF (FONTCONFIG_FOUND)
ADD_DEFINITIONS("-DUSE_FONTCONFIG")
diff -Naur snapshot_7732.orig/avidemux_plugins/CMakeLists.txt snapshot_7732/avidemux_plugins/CMakeLists.txt
--- snapshot_7732.orig/avidemux_plugins/CMakeLists.txt 2012-01-28 20:02:45.000000000 -0600
+++ snapshot_7732/avidemux_plugins/CMakeLists.txt 2012-01-31 12:54:22.867861790 -0600
@@ -37,6 +37,20 @@
LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}")
INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6")
+#########################################
+# Unbundle some libraries here
+#########################################
+OPTION(USE_EXTERNAL_LIBASS "Use system install libass library." OFF)
+
+# libass
+IF(USE_EXTERNAL_LIBASS)
+ INCLUDE(FindPkgConfig)
+ PKG_CHECK_MODULES(LIBASS REQUIRED libass)
+ INCLUDE_DIRECTORIES(LIBASS_INCLUDE_DIRS)
+ENDIF()
+
+
+
IF (FRESH_BUILD)
MESSAGE("")
@@ -203,4 +217,4 @@
include(admPackager)
admPackager(pluginsPackage)
-MESSAGE("")
\ No newline at end of file
+MESSAGE("")
avidemux3-bundled_libs.patch:
ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp | 4 ++--
ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt | 11 +++++++++--
ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp | 2 +-
ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt | 11 +++++++++--
ADM_videoFilters6/ass/ADM_vidASS.cpp | 2 +-
5 files changed, 22 insertions(+), 8 deletions(-)
--- NEW FILE avidemux3-bundled_libs.patch ---
diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt
--- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2011-02-17 13:04:55.000000000 -0600
+++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2012-09-15 15:03:06.009414605 -0500
@@ -1,11 +1,18 @@
INCLUDE(ad_plugin)
-ADD_SUBDIRECTORY(ADM_liba52)
+IF(NOT USE_EXTERNAL_LIBA52)
+ ADD_SUBDIRECTORY(ADM_liba52)
+ENDIF()
SET(ADM_ad_a52_SRCS ADM_ad_a52.cpp)
ADD_AUDIO_DECODER( ADM_ad_a52 ${ADM_ad_a52_SRCS})
-TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52)
+
+IF(USE_EXTERNAL_LIBA52)
+ TARGET_LINK_LIBRARIES(ADM_ad_a52 ${LIBA52_LIBRARIES})
+ELSE()
+ TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52)
+ENDIF()
INIT_AUDIO_PLUGIN(ADM_ad_a52)
INSTALL_AUDIODECODER(ADM_ad_a52)
diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt
--- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2011-02-17 13:04:55.000000000 -0600
+++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2012-09-15 15:04:31.914550564 -0500
@@ -8,13 +8,20 @@
ADD_DEFINITIONS("-DFPM_PPC")
ENDIF (ADM_CPU_X86_32)
-ADD_SUBDIRECTORY(ADM_libMad)
+IF(NOT USE_EXTERNAL_LIBMAD)
+ ADD_SUBDIRECTORY(ADM_libMad)
+ENDIF()
ADD_DEFINITIONS("-DHAVE_ASSERT_H")
SET(ADM_ad_Mad_SRCS ADM_ad_mad.cpp)
ADD_AUDIO_DECODER( ADM_ad_Mad ${ADM_ad_Mad_SRCS})
-TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad)
+
+IF(USE_EXTERNAL_LIBMAD)
+ TARGET_LINK_LIBRARIES(ADM_ad_Mad ${LIBMAD_LIBRARIES})
+ELSE()
+ TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad)
+ENDIF()
INIT_AUDIO_PLUGIN(ADM_ad_Mad)
INSTALL_AUDIODECODER(ADM_ad_Mad)
diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp
--- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2012-08-05 00:50:48.000000000 -0500
+++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2012-09-15 15:15:44.275205965 -0500
@@ -18,8 +18,8 @@
#include "ADM_ad_plugin.h"
extern "C" {
-#include "ADM_liba52/a52.h"
-#include "ADM_liba52/mm_accel.h"
+#include "a52dec/a52.h"
+#include "a52dec/mm_accel.h"
};
#define AC3_HANDLE ((a52_state_t *)ac3_handle)
diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp
--- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2012-06-06 00:51:28.000000000 -0500
+++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2012-09-15 15:16:02.560599956 -0500
@@ -16,7 +16,7 @@
***************************************************************************/
#include "ADM_default.h"
#include "ADM_ad_plugin.h"
-#include "ADM_libMad/mad.h"
+#include "mad.h"
#define Stream ((mad_stream *)_stream)
#define Frame ((mad_frame *)_frame)
diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp avidemux_2.6.0/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp
--- avidemux_2.6.0.orig/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp 2012-08-24 06:52:00.000000000 -0500
+++ avidemux_2.6.0/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp 2012-09-15 16:16:33.076596468 -0500
@@ -23,7 +23,7 @@
extern "C"
{
-#include "ADM_libass/ass.h"
+#include "ass/ass.h"
}
/**
avidemux3-glu_fix.patch:
avidemux/common/ADM_render/GUI_qtGlRender.cpp | 3 ++-
avidemux/qt4/ADM_UIs/src/T_openGL.cpp | 1 +
avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE avidemux3-glu_fix.patch ---
diff -Naur snapshot_7669.orig/avidemux/common/ADM_render/GUI_qtGlRender.cpp snapshot_7669/avidemux/common/ADM_render/GUI_qtGlRender.cpp
--- snapshot_7669.orig/avidemux/common/ADM_render/GUI_qtGlRender.cpp 2011-11-27 20:02:33.000000000 -0600
+++ snapshot_7669/avidemux/common/ADM_render/GUI_qtGlRender.cpp 2011-11-29 08:40:03.430504962 -0600
@@ -20,6 +20,7 @@
# define GL_TEXTURE_RECTANGLE_NV GL_TEXTURE_RECTANGLE_EXT
#else
# include <GL/gl.h>
+# include <GL/glu.h>
# include <GL/glext.h>
#endif
#define ADM_LEGACY_PROGGY // Dont clash with free/malloc etc..
@@ -401,4 +402,4 @@
{
return new QtGlRender();
}
-// EOF
\ No newline at end of file
+// EOF
diff -Naur snapshot_7669.orig/avidemux/qt4/ADM_UIs/src/T_openGL.cpp snapshot_7669/avidemux/qt4/ADM_UIs/src/T_openGL.cpp
--- snapshot_7669.orig/avidemux/qt4/ADM_UIs/src/T_openGL.cpp 2011-11-27 20:02:33.000000000 -0600
+++ snapshot_7669/avidemux/qt4/ADM_UIs/src/T_openGL.cpp 2011-11-29 08:36:33.920379672 -0600
@@ -7,6 +7,7 @@
#include "T_openGLFilter.h"
#include "ADM_default.h"
#include "DIA_coreToolkit.h"
+#include <GL/glu.h>
static QGLWidget *thisWidget=NULL;
/**
diff -Naur snapshot_7669.orig/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp snapshot_7669/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp
--- snapshot_7669.orig/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp 2011-11-27 20:02:37.000000000 -0600
+++ snapshot_7669/avidemux_plugins/ADM_videoFilters6_openGl/glVdpau/ADM_vidVdpauFilterDeintGl.cpp 2011-11-29 08:38:52.901819308 -0600
@@ -12,6 +12,7 @@
#define GL_GLEXT_PROTOTYPES
# include <GL/gl.h>
+# include <GL/glu.h>
# include <GL/glext.h>
#include <QtGui/QImage>
avidemux3-libass.patch:
CMakeLists.txt | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
--- NEW FILE avidemux3-libass.patch ---
--- avidemux3/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt.bund_libs 2012-06-17 21:01:09.000000000 -0500
+++ avidemux3/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2012-06-18 14:52:06.836495759 -0500
@@ -4,15 +4,20 @@
checkFridibi("0.19")
IF (USE_FREETYPE AND USE_FRIDIBI)
- ADD_SUBDIRECTORY(ADM_libass)
-
INCLUDE(vf_plugin)
SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp)
ADD_VIDEO_FILTER(ADM_vf_ssa ${ADM_vf_ssa_SRCS})
IF(DO_COMMON)
- TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS})
+ IF(USE_EXTERNAL_LIBASS)
+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES}
+ ${FREETYPE2_LDFLAGS})
+ ELSE(USE_EXTERNAL_LIBASS)
+ ADD_SUBDIRECTORY(ADM_libass)
+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass
+ ${FREETYPE2_LDFLAGS})
+ ENDIF(USE_EXTERNAL_LIBASS)
IF (FONTCONFIG_FOUND)
ADD_DEFINITIONS("-DUSE_FONTCONFIG")
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 27 Jan 2012 16:57:03 -0000 1.10
+++ .cvsignore 29 Oct 2012 21:16:11 -0000 1.11
@@ -1 +1 @@
-avidemux_2.5.6.tar.gz
+avidemux_2.6.0.tar.gz
Index: avidemux-gtk.desktop
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-gtk.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avidemux-gtk.desktop 27 May 2010 02:05:51 -0000 1.4
+++ avidemux-gtk.desktop 29 Oct 2012 21:16:11 -0000 1.5
@@ -2,7 +2,8 @@
Name=Avidemux Video Editor (GTK)
Comment=Graphical video editing tool - GTK interface
Icon=avidemux
-Exec=avidemux2_gtk
+Exec=avidemux3_gtk
+MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2;
Terminal=false
Type=Application
Categories=AudioVideo;AudioVideoEditing;
Index: avidemux-qt.desktop
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-qt.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avidemux-qt.desktop 27 May 2010 02:05:51 -0000 1.4
+++ avidemux-qt.desktop 29 Oct 2012 21:16:11 -0000 1.5
@@ -2,7 +2,8 @@
Name=Avidemux Video Editor (Qt)
Comment=Graphical video editing tool - Qt interface
Icon=avidemux
-Exec=avidemux2_qt4
+Exec=avidemux3_qt4
+MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2;
Terminal=false
Type=Application
Categories=AudioVideo;AudioVideoEditing;
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- avidemux.spec 5 Sep 2012 22:20:04 -0000 1.67
+++ avidemux.spec 29 Oct 2012 21:16:11 -0000 1.68
@@ -1,49 +1,29 @@
-%define _pkgbuilddir %{_builddir}/%{name}_%{version}
+%global realname avidemux
+%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.5.6
-Release: 9%{?dist}
+Version: 2.6.0
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
-Group: Applications/Multimedia
License: GPLv2+
-URL: http://www.avidemux.org/
-
-Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
-Source1: %{name}-gtk.desktop
-Source2: %{name}-qt.desktop
-
-Patch1: avidemux-2.5-pulseaudio-default.patch
-Patch2: avidemux-2.4-qt4.patch
-# Prevents avidemux from creating the symlinks for .so files, which we do below
-Patch3: avidemux-2.5.3-tmplinktarget.patch
-# libADM_xvidRateCtl.so and libADM_vidEnc_pluginOptions.so are supposed to be
-# built statically according to upstream... Let's get them installed instead
-Patch4: avidemux-2.5.3-mpeg2enc.patch
-Patch5: avidemux-2.5.3-pluginlibs.patch
-Patch6: avidemux-2.5.6-ffmpeg_aac.patch
-Patch7: avidemux-2.5.5-gcc46_tmp_fix.patch
-# Use system libraries
-Patch8: avidemux-2.5.4-libass.patch
-Patch9: avidemux-2.5.4-liba52.patch
-Patch10: avidemux-2.5.4-libmad.patch
-Patch11: avidemux-2.5.4-libtwolame.patch
-Patch12: avidemux-2.5.5_fix_lav_audio_encoder.patch
-# Patch for ABI change in x264 115.
-Patch13: avidemux-2.5.5-x264_i_to_b_open_gop.patch
-Patch14: avidemux-2.5.6-ffmpeg_parallel_build.patch
-
-# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
-ExcludeArch: ppc ppc64
-
-Requires: %{name}-cli = %{version}-%{release}
-Requires: %{name}-gui = %{version}
-Requires: %{name}-plugins = %{version}
+URL: http://www.avidemux.org
+Source0: http://downloads.sourceforge.net/%{realname}/%{realname}_%{version}.tar.gz
+Source1: avidemux-qt.desktop
+Source2: avidemux-gtk.desktop
+
+Patch0: avidemux-2.5.6-ffmpeg_parallel_build.patch
+Patch1: avidemux-2.6-bundled_libs.patch
+Patch2: avidemux3-libass.patch
+Patch3: avidemux3-bundled_libs.patch
-# Compiling
+# Utilities
BuildRequires: cmake
-BuildRequires: gettext-devel intltool
+BuildRequires: gettext intltool
BuildRequires: libxslt
+BuildRequires: desktop-file-utils
+BuildRequires: pkgconfig
+BuildRequires: sqlite-devel
# Libraries
BuildRequires: yasm-devel
@@ -61,8 +41,10 @@
BuildRequires: alsa-lib-devel >= 1.0.3
BuildRequires: pulseaudio-libs-devel
-# Video out
+# Video out
BuildRequires: SDL-devel >= 1.2.7
+BuildRequires: mesa-libGL-devel mesa-libGLU-devel
+BuildRequires: libvdpau-devel
# Audio Codecs
BuildRequires: a52dec-devel >= 0.7.4
@@ -81,13 +63,12 @@
BuildRequires: xvidcore-devel >= 1.0.2
BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
-#BuildRequires: mjpegtools-devel
-# FIXME: aften not packaged, add BR when it is
+Conflicts: avidemux < 2.6.0
+Provides: avidemux = %{version}-%{release}
-# Finally...
-BuildRequires: desktop-file-utils
-Requires: hicolor-icon-theme
+# Main package is a metapackage, bring in something useful.
+Requires: avidemux-gui = %{version}-%{release}
%description
@@ -96,9 +77,6 @@
MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
using projects, job queue and powerful scripting capabilities.
-For compatibility reasons, avidemux is a meta-package which installs the
-graphical, command line and plugin packages. If you want a smaller setup,
-you may selectively install one or more of the avidemux-* subpackages.
%package cli
Summary: CLI for %{name}
@@ -111,9 +89,7 @@
%package libs
Summary: Libraries for %{name}
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-plugins
-Provides: %{name}-plugins = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description libs
This package contains the runtime libraries for %{name}.
@@ -121,12 +97,13 @@
%package gtk
Summary: GTK interface for %{name}
Group: Applications/Multimedia
-BuildRequires: gtk2-devel >= 2.8.0
+BuildRequires: gtk3-devel
BuildRequires: cairo-devel
# Slightly higher so it is default, but it can be avoided by installing
# avidemux-qt directly or it can be removed later once avidemux-qt is installed
Provides: %{name}-gui = %{version}-%{release}.1
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-help = %{version}-%{release}
%description gtk
This package provides the GTK graphical interface for %{name}.
@@ -139,94 +116,106 @@
BuildRequires: qt4-devel >= 4.5.0-9
Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-help = %{version}-%{release}
%description qt
This package contains the Qt graphical interface for %{name}.
+%package help
+Summary: Help files for %{name}
+Requires: %{name}-gui = %{version}-%{release}
+BuildArch: noarch
+
+%description help
+This package contains the help files for %{name}.
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-%prep
-%setup -q -n %{name}_%{version}
+%description devel
+This package contains files required to develop with or extend %{name}.
-# Remove unneeded external libraries
-%if 0%{?fedora} <= 14
-rm -rf avidemux/ADM_libraries/ADM_smjs
-%endif
-rm -rf plugins/ADM_videoFilters/Ass/ADM_libAss
-rm -rf plugins/ADM_audioEncoders/twolame/ADM_libtwolame
-rm -rf plugins/ADM_audioDecoders/ADM_ad_mad/ADM_libMad
-rm -rf plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52
-#rm -rf plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc
-
-# change hardcoded libdir paths
-%ifarch x86_64 ppc64
-sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/ADM_core/src/ADM_fileio.cpp
-sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
-%endif
-
-#patch0 -p1 -b .parallel
-%patch1 -p1 -b .pulse
-%patch2 -p1 -b .qt4
-%patch3 -p1 -b .tmplinktarget
-%patch4 -p1 -b .mpeg2enc
-%patch5 -p1 -b .pluginlibs
-%patch6 -p1 -b .ffmpegaac
-%patch7 -p1 -b .gcc46tmpfix
-%patch8 -p1 -b .libass
-%patch9 -p1 -b .liba52
-%patch10 -p1 -b .libmad
-%patch11 -p1 -b .libtwolame
-#patch12 -p1 -b .lavencode
-#patch13 -p1 -b .x264
-%patch14 -p1 -b .ffmpegbuild
+
+%prep
+%setup -q -n %{realname}_%{version}
+#patch0 -p1 -b .ffmpeg_build
+%patch1 -p1 -b .bund_libs
+%patch2 -p1 -b .libass
+%patch3 -p1 -b .bund_libs2
+
+# 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
%build
-# Cmake requires out of source build
-mkdir -p build && pushd build
-%if 0%{?fedora} <= 14
-%cmake -DUSE_SYSTEM_SPIDERMONKEY:BOOL=ON .. \
-%else
-%cmake -DUSE_SYSTEM_SPIDERMONKEY:BOOL=OFF .. \
-%endif
+# Build avidemux_core
+LDFLAGS="-Wl,--as-needed";export LDFLAGS
+rm -rf build_core && mkdir build_core && pushd build_core
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ ../avidemux_core
+make
+#%{?_smp_mflags}
+
+# We have to do a fake install so header files are avaialble for the other
+# packages.
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+# Build cli interface
+rm -rf build_cli && mkdir build_cli && pushd build_cli
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ ../avidemux/cli
make %{?_smp_mflags}
-# Create the temp link directory manually since otherwise it happens too early
-mkdir -p %{_pkgbuilddir}/build/%{_lib}
-find %{_pkgbuilddir}/build/avidemux -name '*.so*' | \
- xargs ln -sft %{_pkgbuilddir}/build/%{_lib}
popd
-mkdir -p build_plugins && pushd build_plugins
-%cmake -DAVIDEMUX_INSTALL_PREFIX="%{_pkgbuilddir}/build/" \
- -DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
- -DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
- ../plugins
+# Build QT4 gui
+rm -rf build_qt4 && mkdir build_qt4 && pushd build_qt4
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ ../avidemux/qt4
make %{?_smp_mflags}
popd
+# Build GTK gui
+rm -rf build_gtk && mkdir build_gtk && pushd build_gtk
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ ../avidemux/gtk
+make %{?_smp_mflags}
+popd
-%install
-make -C build install DESTDIR=%{buildroot}
-make -C build_plugins install DESTDIR=%{buildroot}
-
-#install -d -m755 %{buildroot}%{_datadir}/pixmaps
-#install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png
+# Build avidemux_plugins
+rm -rf build_plugins && mkdir build_plugins && pushd build_plugins
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{realname}_%{version} \
+ -DPLUGIN_UI=COMMON \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+popd
-# Install icons
-install -pDm 0644 avidemux/ADM_icons/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
-# Find and remove all la files
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+%install
+make -C build_core install DESTDIR=%{buildroot}
+make -C build_cli install DESTDIR=%{buildroot}
+make -C build_qt4 install DESTDIR=%{buildroot}
+make -C build_gtk install DESTDIR=%{buildroot}
+make -C build_plugins install DESTDIR=%{buildroot}
-# Remove Windows-only executables
-# Must check this for new Linux-relevant files upon new avidemux releases
-rm -rf %{buildroot}%{_datadir}/ADM_addons/avsfilter
-rmdir %{buildroot}%{_datadir}/ADM_addons/
+# FFMpeg libraries are not being installed as executable.
+chmod +x %{buildroot}%{_libdir}/libADM6*.so.*
-# Install .desktop shortcuts
+# Install desktop files
desktop-file-install --vendor rpmfusion \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
@@ -235,363 +224,82 @@
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
-# Remove duplicated Qt translations
-rm -f %{buildroot}%{_datadir}/%{name}/i18n/qt_*.qm
-# find_lang.sh doesn't recognize this one, and there already is avidemux_sr.qm
-rm -f %{buildroot}%{_datadir}/%{name}/i18n/avidemux_sr(a)latin.qm
-
-# Qt-style translations
-%find_lang %{name} --with-qt --without-mo
-mv -f %{name}.lang %{name}-qt.lang
-# Gettext-style translations
-%find_lang %{name}
+# Install icons
+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
+
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
-%post libs
-/sbin/ldconfig
+%post gtk
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+
+%post qt
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+
-%postun libs
-/sbin/ldconfig
+%postun gtk
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+/usr/bin/update-desktop-database &> /dev/null || :
-%posttrans
+%postun qt
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+/usr/bin/update-desktop-database &> /dev/null || :
+
+%posttrans gtk
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%posttrans qt
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%doc AUTHORS COPYING README TODO
+%doc AUTHORS COPYING README
%files libs
-%{_datadir}/ADM_scripts/
-%{_datadir}/icons/hicolor/48x48/apps/avidemux.png
-%{_datadir}/icons/hicolor/64x64/apps/avidemux.png
+%{_datadir}/icons/hicolor/*/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_UI*
%exclude %{_libdir}/libADM_render*
-%{_libdir}/ADM_plugins/
-%exclude %{_libdir}/ADM_plugins/videoEncoder/*/*Gtk.so
-%exclude %{_libdir}/ADM_plugins/videoEncoder/*/*Qt.so
-%exclude %{_libdir}/ADM_plugins/videoFilter/*cli.so
-%exclude %{_libdir}/ADM_plugins/videoFilter/*gtk.so
-%exclude %{_libdir}/ADM_plugins/videoFilter/*qt4.so
+%{_libdir}/ADM_plugins6/
%files cli
-%{_bindir}/avidemux2_cli
-%{_libdir}/libADM_UICli.so
-%{_libdir}/libADM_render_cli.so
-%{_libdir}/ADM_plugins/videoFilter/*cli.so
-
-
-%files gtk -f %{name}.lang
-%{_bindir}/avidemux2_gtk
-%{_libdir}/libADM_UIGtk.so
-%{_libdir}/libADM_render_gtk.so
-%{_libdir}/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Gtk.so
-%{_libdir}/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Gtk.so
-%{_libdir}/ADM_plugins/videoFilter/*gtk.so
-%{_datadir}/applications/*gtk*.desktop
-
-%files qt -f %{name}-qt.lang
-%{_bindir}/avidemux2_qt4
-%{_libdir}/libADM_UIQT4.so
-%{_libdir}/libADM_render_qt4.so
-%{_libdir}/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Qt.so
-%{_libdir}/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Qt.so
-%{_libdir}/ADM_plugins/videoFilter/*qt4.so
-%{_datadir}/applications/*qt*.desktop
-%dir %{_datadir}/%{name}/i18n
-
-
-%changelog
-* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.6-9
-- Rebuilt for x264 ABI 125
-
-* Mon May 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.6-8
-- Rebuilt for opencore-arm
-
-* Fri May 04 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-7
-- Rebuild for FTBFS for F-17.
-
-* Tue Mar 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.6-6
-- Rebuilt for x264 ABI 0.120
-
-* Fri Mar 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.6-5
-- Rebuilt
-
-* Wed Feb 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-4
-- Rebuild for libvpx soname bump.
-
-* Sat Jan 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.6-3
-- Install icon files to preferred location.
-- Reenable FFmpeg based AAC encoding.
-- Update to latest release.
-
-* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-6
-- Obsolete useless devel subpackage which has multilib issues.
-
-* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-4
-- Moved UI specific libraries and plugins to their respective sub-package to prevent
- unneeded dependencies from being installed.
-- Obsoleted plugins sub-package and combined with libs sub-package.
-
-* Fri Jul 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-2
-- Patch for x254 ABI 115 change (#1848).
-
-* Sun Jun 05 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-1
-- New release: 2.5.5
-- FFMpeg based AAC encoding is broken (BZ#1825) and
- will be disabled until fixed.
-
-* Sat Jun 04 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-9
-- New version of js in Fedora 15 breaks build.
-- Re-enable built-in javascript for Fedora 15.
-
-* Wed May 26 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-8
-- Use system libass (subtitles).
-- Use system liba52 (ac3 decoding).
-- Use system libmad.
-- Use system libtwolame.
-
-* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-6
-- Really fix AAC this time.
-- Really fix x264 this time.
-
-* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-5
-- AAC encoding now working. (Kevin Kofler)
-- Fedora 15 build dependecy fixed. (Kevin Kofler)
-- Audio device peferences now remembered.
-
-* Wed Apr 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-4
-- Disabled non-working patch for experimental aac encoding with ffmpeg.
-- Removed dependency on bundled javascript library. Now uses system library.
-- Added optional opencore-amr decoding support.
-
-* Tue Apr 19 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-3
-- Fixes gcc 4.6 errors that used to be warnings.
-- Fixes compile issues with x264 being too new.
-- Fixes potential crash betwen gtk and opengl.
-
-* Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-2
-- Upload missing patch to CVS.
-
-* Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-1
-- Updated to version 2.5.4.
-
-* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.3-5
-- Rebuild for x264
+%{_bindir}/avidemux3_cli
+%{_libdir}/libADM_UI_Cli6.so
+%{_libdir}/libADM_render6_cli.so
+
+%files gtk
+%{_bindir}/avidemux3_gtk
+%{_libdir}/libADM_UIGtk6.so
+%{_libdir}/libADM_render6_gtk.so
+%{_libdir}/ADM_glade/
+%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop
+
+%files qt
+%{_bindir}/avidemux3_qt4
+%{_bindir}/avidemux3_jobs
+%{_libdir}/libADM_UIQT46.so
+%{_libdir}/libADM_render6_qt4.so
+%{_datadir}/applications/rpmfusion-avidemux-qt.desktop
-* Tue Jul 20 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-4
-- Rebuild for new x264
+%files help
+%{_datadir}/avidemux6/help/
-* Sun May 30 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-3
-- Add /usr/bin/xsltproc BR for qt4 subpackage
+%files devel
+%{_includedir}/avidemux/
-* Wed May 26 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-2
-- Bump for F-13 --> devel EVR
-
-* Wed May 26 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-1
-- Update to 2.5.3 release
-- Use avidemux.png as icon in the desktop shorcuts to fix problem on KDE
-- Make ldconfig run in post/postun of libs package
-- Fix typo in %%description
-
-* Wed Jan 27 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2-4
-- Remove the i18n folder from %%files, as it seems it does not get created nor
- populated with any files on rawhide.
-
-* Tue Jan 26 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2-3
-- Fix stupid mistake in mkdir command (add -p for subdir creation)
-
-* Mon Jan 25 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2-2
-- Temporary workaround for build failure on rawhide
-
-* Mon Jan 18 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2-1
-- Update to 2.5.2 release
-
-* Thu Nov 5 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 2.5.1-6.20091010svn
-- Update bugfix to 20091105
-
-* Sat Oct 24 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-5.20091010svn
-- Temporarily disable FAAC as per discussion on RF-dev ML
-- Create temporary linking dir before running find | xargs
-
-* Fri Oct 23 2009 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 2.5.1-4.20091010svn
-- Update desktop file according to F-12 FedoraStudio feature
-
-* Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-3.20091010svn
-- Fix AVIDEMUX_INSTALL_PREFIX define so plugins can link correctly
-
-* Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-2.20091010svn
-- Update to 2.5.1 subversion r5371
-
-* Fri Jun 19 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-9
-- Add patch to fix build with CMake 2.6.4
-- Update gcc44 patch to match Gentoo upstream
-- Update PulseAudio patch to work as expected with avidemux 2.4.4
-
-* Sun May 03 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 2.4.4-8
-- skip %%_smp_mflags in po/
-
-* Sat Apr 25 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-7
-- Test build with ppc* enabled
-
-* Sat Apr 25 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-6
-- Rebuild, disable ppc* for now
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.4.4-5
-- rebuild for new F11 features
-
-* Wed Mar 25 2009 Dominik Mierzejewski <rpm at greysector.net> - 2.4.4-4
-- Fix gcc 4.4 patch
-- Improve dca patch
-
-* Sun Mar 22 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-3
-- Apply the patch
-
-* Sun Mar 22 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-2
-- Fix build errors when compiling with gcc 4.4 (#386) (thanks to Rathann)
-
-* Wed Feb 18 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-1
-- Update to 2.4.4 final, update patches accordingly
-- Move Qt translation files to qt subpackage
-
-* Sun Dec 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 2.4.3-8
-- Fix build with current x264
-
-* Fri Dec 5 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-7.1
-- Rebuild for 20081202 ffmpeg snapshot
-
-* Tue Nov 25 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-7
-- Don't uselessly provide avidemux-cli
-- Make GUI and CLI subpackages require the main package (fixes bz#178)
-
-* Tue Nov 25 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-6
-- Bump release to fix EVR
-
-* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-5
-- Add CMake patch for PPC64
-- Update patches for 2.4.3
-- Remove outdated libmad patch (Nov. 2007)
-
-* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-4
-- Add another patch to fix ppc64 build (pointer type), first
- patch was for libmad
-
-* Fri Aug 22 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-3
-- Add patch to fix ppc64 build
-
-* Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-2
-- retag
-
-* Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-1
-- Update to 2.4.3
-
-* Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.2-3
-- ppc64 uint_32 fun
-
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.4.2-2
-- rebuild
-
-* Sat Jul 19 2008 Thorsten Leemhuis <s.adam at diffingo.com> - 2.4.2-1
-- Update to 2.4.2
-
-* Wed May 21 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-3.20080521svn
-- Disable --new-faad
-- 20080521 subversion snapshot
-
-* Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-2
-- Disable %%{?_smp_mflags}
-
-* Sat Mar 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4.1-1
-- Update to 2.4.1
-- Don't list the bin files twice, revisited
-- Default to GTK frontend
-
-* Wed Feb 20 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-6.20080126svn
-- Make pulseaudio default for sound out
-- Don't list the bin files twice
-- Don't build with arts support
-
-* Fri Feb 15 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-5.20080126svn
-- Don't list the .desktop files twice (bz#1870)
-- Oops, we should have %%{svndate}svn in release tag!
-
-* Sat Feb 2 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-4
-- F-8/F-7 x86_64 does seem to need --with-newfaad
-
-* Fri Feb 1 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-3
-- Update to version 2.4 (20080126svn) and include fixes from devel branch
-
-* Mon Jan 14 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-2
-- Fix many copy/paste errors and desktop file's Exec field
-
-* Sun Jan 13 2008 Stewart Adam <s.adam AT diffingo DOT com> - 2.4-1
-- Update to 2.4 final
-- Split up desktop files and make them pass desktop-file-validate
-- Add structure to split into gtk and qt pacakges
-- Disable qt4 for now, doesn't compile
-
-* Sun Oct 7 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info>3- 2.3.0-4.3
-- move js-include to a place where it is honored
-
-* Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.2
-- Fix macro problem
-- Fix changelog date
-- Rebuild with faad, but don't pass --newfaad
-
-* Sun Oct 7 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4.1
-- Rebuild with no faad
-
-* Sat Oct 6 2007 Stewart Adam <s.adam AT diffingo DOT com> - 2.3.0-4
-- Rebuild for ffmpeg dependency problems
-- Update License: tag per Fedora guidelines
-
-* Sat Jan 13 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-3
-- more features with new BR's: x264-devel libXv-devel
-- make a note regarding the libdca-devel problem
-- remove the "0:" from the versioned BR's
-
-* Thu Jan 04 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.3.0-2
-- don't use smp_mflags during make for now
-
-* Sat Dec 23 2006 kwizart < kwizart at gmail.com > - 2.3.0-1
-- Update to 2.3.0 Final
-- Use find_lang
-
-* Mon Apr 03 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.1.2-1
-- Update to 2.1.2
-
-* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- switch to new release field
-
-* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- add dist
-
-* Wed Jan 04 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.1.0-0.lvn.1
-- Update to 2.1.0
-- Drop epoch
-- gtk 2.6 now, so drop FC3 support
-
-* Sat Aug 27 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.3
-- Remove bogus BR ffmpeg-devel (#555)
-
-* Thu Jul 09 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.2
-- Add missing BR desktop-file-utils (thanks to ixs)
-
-* Thu Jul 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.42-0.lvn.1
-- Update to 2.0.42
-
-* Sat Jan 22 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.36-0.lvn.1
-- Update to 2.0.34
-- Rename package to avidemux -- no need for avidemux2 afaics
-
-* Sun Nov 21 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.34-0.lvn.1.test1
-- Update to 2.0.34-test1
-- BR gettext, libtool
-
-* Tue Oct 18 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:2.0.30-0.lvn.1
-- Initial RPM release.
+%changelog
+* Sun Oct 14 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-1
+- Update to new upstream release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 27 Jan 2012 16:57:03 -0000 1.10
+++ sources 29 Oct 2012 21:16:11 -0000 1.11
@@ -1 +1 @@
-00e479dd806b94a98d3f0f40639e88a9 avidemux_2.5.6.tar.gz
+7197933146168e83013fff286afc8b1b avidemux_2.6.0.tar.gz
--- 2.5.0-coreImage-parallel-build.patch DELETED ---
--- 2.5.3_mjpeg_fix.diff DELETED ---
--- avidemux-2.4-qt4.patch DELETED ---
--- avidemux-2.5-libmpeg2enc-altivec.patch DELETED ---
--- avidemux-2.5-pulseaudio-default.patch DELETED ---
--- avidemux-2.5.3-mpeg2enc.patch DELETED ---
--- avidemux-2.5.3-pluginlibs.patch DELETED ---
--- avidemux-2.5.3-tmplinktarget.patch DELETED ---
--- avidemux-2.5.4-liba52.patch DELETED ---
--- avidemux-2.5.4-libass.patch DELETED ---
--- avidemux-2.5.4-libmad.patch DELETED ---
--- avidemux-2.5.4-libtwolame.patch DELETED ---
--- avidemux-2.5.5-gcc46_tmp_fix.patch DELETED ---
--- avidemux-2.5.5-x264_i_to_b_open_gop.patch DELETED ---
--- avidemux-2.5.5_fix_lav_audio_encoder.patch DELETED ---
--- avidemux-2.5.6-ffmpeg_aac.patch DELETED ---
--- avidemux-2.5.6-ffmpeg_parallel_build.patch DELETED ---
--- avidemux_2.5.5-ffmpeg_aac.patch DELETED ---
12 years
- 1
- 0
rpms/mythweb/F-16 .cvsignore, 1.1, 1.2 mythweb.spec, 1.2, 1.3 sources, 1.2, 1.3 mythweb-fixes.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32046
Modified Files:
.cvsignore mythweb.spec sources
Removed Files:
mythweb-fixes.patch
Log Message:
* Mon Oct 29 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.3-1
- Update to latest upstream release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-16/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 4 Jul 2012 20:54:37 -0000 1.1
+++ .cvsignore 29 Oct 2012 20:46:44 -0000 1.2
@@ -0,0 +1 @@
+MythTV-mythweb-v0.25.3-0-g89a347c.tar.gz
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-16/mythweb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mythweb.spec 7 Jul 2012 03:01:24 -0000 1.2
+++ mythweb.spec 29 Oct 2012 20:46:44 -0000 1.3
@@ -1,16 +1,15 @@
# Mythweb from github.com
# git hash for archive
%global githash1 g89a347c
-# git hash for root source directory
-%global githash2 ae20c88
+%global githash2 a8ad01c
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.25.1
-Release: 3%{?dist}
+Version: 0.25.3
+Release: 1%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -21,7 +20,7 @@
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
-Patch0: mythweb-fixes.patch
+#Patch0: mythweb-fixes.patch
# Needed for PHP 5.4
Patch1: mythweb-php54.patch
@@ -79,6 +78,12 @@
%changelog
+* Mon Oct 29 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.3-1
+- Update to latest upstream release.
+
+* Mon Jul 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
+- Update to latests release.
+
* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-3
- Patch for PHP 5.4 warnings.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-16/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 6 Jul 2012 18:02:12 -0000 1.2
+++ sources 29 Oct 2012 20:46:44 -0000 1.3
@@ -1 +1 @@
-70d2ee6ffe336f609a955df002ae0cbd MythTV-mythweb-v0.25.1-0-g89a347c.tar.gz
+508677f943ba7f15cc9b62b59418fb99 MythTV-mythweb-v0.25.3-0-g89a347c.tar.gz
--- mythweb-fixes.patch DELETED ---
12 years
- 1
- 0
rpms/mythweb/F-17 mythweb.spec, 1.3, 1.4 sources, 1.3, 1.4 mythweb-php54.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31752
Modified Files:
mythweb.spec sources
Removed Files:
mythweb-php54.patch
Log Message:
* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
* Update to latest upstream release.
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-17/mythweb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythweb.spec 30 Jul 2012 21:14:58 -0000 1.3
+++ mythweb.spec 29 Oct 2012 20:42:21 -0000 1.4
@@ -1,15 +1,14 @@
# Mythweb from github.com
# git hash for archive
-%global githash1 g89a347c
-# git hash for root source directory
-%global githash2 89353c5
+%global githash1 g4dcd253
+%global githash2 4e9fd7a
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.25.2
+Version: 0.26.0
Release: 1%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -23,9 +22,6 @@
# git diff -p --stat %{version} > mythweb-fixes.patch
#Patch0: mythweb-fixes.patch
-# Needed for PHP 5.4
-Patch1: mythweb-php54.patch
-
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
#Requires: mythtv-backend >= %{version}-%{release}
@@ -36,6 +32,7 @@
Requires: php-mysql
Requires: php-process
Requires: php-MythTV >= %{version}
+Requires: mythffmpeg
BuildArch: noarch
@@ -46,7 +43,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-%patch1 -p1 -b .php54
+#patch1 -p1 -b .php54
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -79,6 +76,9 @@
%changelog
+* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
+* Update to latest upstream release.
+
* Mon Jul 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
- Update to latests release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-17/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 30 Jul 2012 21:14:58 -0000 1.3
+++ sources 29 Oct 2012 20:42:21 -0000 1.4
@@ -1 +1 @@
-8f9e77626e138f6a9981ac6472c79818 MythTV-mythweb-v0.25.2-0-g89a347c.tar.gz
+806f8a2187cfad356da541303120f048 MythTV-mythweb-v0.26.0-0-g4dcd253.tar.gz
--- mythweb-php54.patch DELETED ---
12 years
- 1
- 0
rpms/mythweb/F-18 mythweb.spec, 1.3, 1.4 sources, 1.3, 1.4 mythweb-php54.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31602
Modified Files:
mythweb.spec sources
Removed Files:
mythweb-php54.patch
Log Message:
* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
* Update to latest upstream release.
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/mythweb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythweb.spec 30 Jul 2012 21:14:03 -0000 1.3
+++ mythweb.spec 29 Oct 2012 20:41:38 -0000 1.4
@@ -1,15 +1,14 @@
# Mythweb from github.com
# git hash for archive
-%global githash1 g89a347c
-# git hash for root source directory
-%global githash2 89353c5
+%global githash1 g4dcd253
+%global githash2 4e9fd7a
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.25.2
+Version: 0.26.0
Release: 1%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -23,9 +22,6 @@
# git diff -p --stat %{version} > mythweb-fixes.patch
#Patch0: mythweb-fixes.patch
-# Needed for PHP 5.4
-Patch1: mythweb-php54.patch
-
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
#Requires: mythtv-backend >= %{version}-%{release}
@@ -36,6 +32,7 @@
Requires: php-mysql
Requires: php-process
Requires: php-MythTV >= %{version}
+Requires: mythffmpeg
BuildArch: noarch
@@ -46,7 +43,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-%patch1 -p1 -b .php54
+#patch1 -p1 -b .php54
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -79,6 +76,9 @@
%changelog
+* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
+* Update to latest upstream release.
+
* Mon Jul 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
- Update to latests release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/F-18/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 30 Jul 2012 21:14:03 -0000 1.3
+++ sources 29 Oct 2012 20:41:38 -0000 1.4
@@ -1 +1 @@
-8f9e77626e138f6a9981ac6472c79818 MythTV-mythweb-v0.25.2-0-g89a347c.tar.gz
+806f8a2187cfad356da541303120f048 MythTV-mythweb-v0.26.0-0-g4dcd253.tar.gz
--- mythweb-php54.patch DELETED ---
12 years
- 1
- 0
rpms/mythweb/devel .cvsignore, 1.3, 1.4 mythweb.spec, 1.3, 1.4 sources, 1.3, 1.4 mythweb-php54.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31533
Modified Files:
.cvsignore mythweb.spec sources
Removed Files:
mythweb-php54.patch
Log Message:
* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
* Update to latest upstream release.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 30 Jul 2012 21:14:03 -0000 1.3
+++ .cvsignore 29 Oct 2012 20:40:49 -0000 1.4
@@ -1 +1 @@
-MythTV-mythweb-v0.25.2-0-g89a347c.tar.gz
+MythTV-mythweb-v0.26.0-0-g4dcd253.tar.gz
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mythweb.spec 30 Jul 2012 21:14:03 -0000 1.3
+++ mythweb.spec 29 Oct 2012 20:40:49 -0000 1.4
@@ -1,15 +1,14 @@
# Mythweb from github.com
# git hash for archive
-%global githash1 g89a347c
-# git hash for root source directory
-%global githash2 89353c5
+%global githash1 g4dcd253
+%global githash2 4e9fd7a
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.25.2
+Version: 0.26.0
Release: 1%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -23,9 +22,6 @@
# git diff -p --stat %{version} > mythweb-fixes.patch
#Patch0: mythweb-fixes.patch
-# Needed for PHP 5.4
-Patch1: mythweb-php54.patch
-
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
#Requires: mythtv-backend >= %{version}-%{release}
@@ -36,6 +32,7 @@
Requires: php-mysql
Requires: php-process
Requires: php-MythTV >= %{version}
+Requires: mythffmpeg
BuildArch: noarch
@@ -46,7 +43,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-%patch1 -p1 -b .php54
+#patch1 -p1 -b .php54
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -79,6 +76,9 @@
%changelog
+* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
+* Update to latest upstream release.
+
* Mon Jul 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
- Update to latests release.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 30 Jul 2012 21:14:03 -0000 1.3
+++ sources 29 Oct 2012 20:40:49 -0000 1.4
@@ -1 +1 @@
-8f9e77626e138f6a9981ac6472c79818 MythTV-mythweb-v0.25.2-0-g89a347c.tar.gz
+806f8a2187cfad356da541303120f048 MythTV-mythweb-v0.26.0-0-g4dcd253.tar.gz
--- mythweb-php54.patch DELETED ---
12 years
- 1
- 0
rpms/mythtv/F-16 mythtv-0.25.2-hls_link.patch,NONE,1.1
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31408
Added Files:
mythtv-0.25.2-hls_link.patch
Log Message:
Add missing patch.
mythtv-0.25.2-hls_link.patch:
httplivestream.cpp | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- NEW FILE mythtv-0.25.2-hls_link.patch ---
diff --git a/mythtv/libs/libmythtv/httplivestream.cpp b/mythtv/libs/libmythtv/httplivestream.cpp
index a0a47f8..7f35b0f 100644
--- a/mythtv/libs/libmythtv/httplivestream.cpp
+++ b/mythtv/libs/libmythtv/httplivestream.cpp
@@ -499,9 +499,8 @@ bool HTTPLiveStream::UpdateSizeInfo(uint16_t width, uint16_t height,
QString newFullURL = m_httpPrefix + newOutBase + ".m3u8";
QString newRelativeURL;
- if (newFullURL.contains("/Content/GetFile"))
- newRelativeURL = "/Content/GetFile?StorageGroup=Streaming&FileName=" +
- newOutBase + ".m3u8";
+ if (newFullURL.contains("/StorageGroup/"))
+ newRelativeURL = "/StorageGroup/Streaming/" + newOutBase + ".m3u8";
else
newRelativeURL = newOutBase + ".m3u8";
@@ -713,14 +712,14 @@ void HTTPLiveStream::SetOutputVars(void)
}
m_httpPrefix = gCoreContext->GetSetting("HTTPLiveStreamPrefix", QString(
- "http://%1:%2/Content/GetFile?StorageGroup=Streaming&FileName=")
+ "http://%1:%2/StorageGroup/Streaming/")
.arg(gCoreContext->GetSetting("MasterServerIP"))
.arg(gCoreContext->GetSetting("BackendStatusPort")));
if (!gCoreContext->GetSetting("HTTPLiveStreamPrefixRel").isEmpty())
m_httpPrefixRel = gCoreContext->GetSetting("HTTPLiveStreamPrefixRel");
- else if (m_httpPrefix.contains("/Content/GetFile"))
- m_httpPrefixRel = "/Content/GetFile?StorageGroup=Streaming&FileName=";
+ else if (m_httpPrefix.contains("/StorageGroup/"))
+ m_httpPrefixRel = "";
else
m_httpPrefixRel = "";
}
12 years
- 1
- 0
rpms/mythtv/F-16 mythtv-0.25.3-fixes.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 mythtv.spec, 1.96, 1.97 sources, 1.55, 1.56 mythtv-0.25.2-fixes.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31072
Modified Files:
.cvsignore mythtv.spec sources
Added Files:
mythtv-0.25.3-fixes.patch
Removed Files:
mythtv-0.25.2-fixes.patch
Log Message:
* Mon Oct 29 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.3-1
- Update to latest upstream release.
mythtv-0.25.3-fixes.patch:
bindings/python/MythTV/altdict.py | 2
bindings/python/MythTV/dataheap.py | 58 ++++++++--
bindings/python/MythTV/system.py | 4
libs/libmythtv/ThreadedFileWriter.cpp | 2
libs/libmythui/mythuiwebbrowser.cpp | 10 -
programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 16 ++
6 files changed, 68 insertions(+), 24 deletions(-)
--- NEW FILE mythtv-0.25.3-fixes.patch ---
mythtv/bindings/python/MythTV/altdict.py | 2 +-
mythtv/bindings/python/MythTV/dataheap.py | 58 ++++++++++++++++----
mythtv/bindings/python/MythTV/system.py | 4 +-
mythtv/libs/libmythtv/ThreadedFileWriter.cpp | 2 +-
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10 +---
.../distros/mythtv_data/data_mythtv.py | 16 +++++-
6 files changed, 68 insertions(+), 24 deletions(-)
diff --git a/mythtv/bindings/python/MythTV/altdict.py b/mythtv/bindings/python/MythTV/altdict.py
index 61c1e73..e9d1425 100644
--- a/mythtv/bindings/python/MythTV/altdict.py
+++ b/mythtv/bindings/python/MythTV/altdict.py
@@ -115,7 +115,7 @@ class DictData( OrdDict ):
if name in self._localvars:
self.__dict__[name] = value
elif name not in self._field_order:
- self.__dict__[name] = value
+ object.__setattr__(self, name, value)
else:
try:
self[name] = value
diff --git a/mythtv/bindings/python/MythTV/dataheap.py b/mythtv/bindings/python/MythTV/dataheap.py
index d99167f..d52c7de 100644
--- a/mythtv/bindings/python/MythTV/dataheap.py
+++ b/mythtv/bindings/python/MythTV/dataheap.py
@@ -17,20 +17,55 @@ import locale
import xml.etree.cElementTree as etree
from datetime import date, time
-class Artwork( unicode ):
+from UserString import MutableString
+class Artwork( MutableString ):
_types = {'coverart': 'Coverart',
'coverfile': 'Coverart',
'fanart': 'Fanart',
'banner': 'Banners',
'screenshot': 'ScreenShots',
'trailer': 'Trailers'}
- def __new__(self, attr, parent=None, imagetype=None):
- s = u''
- if parent and (parent[attr] is not None):
- s = parent[attr]
- return super(Artwork, self).__new__(self, s)
+
+ @property
+ def data(self):
+ try:
+ val = self.parent[self.attr]
+ except:
+ raise RuntimeError("Artwork property must be used through an " +\
+ "object, not independently.")
+ else:
+ if val is None:
+ return ''
+ return val
+ @data.setter
+ def data(self, value):
+ try:
+ self.parent[self.attr] = value
+ except:
+ raise RuntimeError("Artwork property must be used through an " +\
+ "object, not independently.")
+ @data.deleter
+ def data(self):
+ try:
+ self.parent[self.attr] = self.parent._defaults.get(self.attr, "")
+ except:
+ raise RuntimeError("Artwork property must be used through an " +\
+ "object, not independently.")
+
+ def __new__(cls, attr, parent=None, imagetype=None):
+ if (imagetype is None) and (attr not in cls._types):
+ # usage appears to be export from immutable UserString methods
+ # return a dumb string
+ return unicode.__new__(unicode, attr)
+ else:
+ return super(Artwork, cls).__new__(cls, attr, parent, imagetype)
def __init__(self, attr, parent=None, imagetype=None):
+ # replace standard MutableString init to not overwrite self.data
+ from warnings import warnpy3k
+ warnpy3k('the class UserString.MutableString has been removed in '
+ 'Python 3.0', stacklevel=2)
+
self.attr = attr
if imagetype is None:
imagetype = self._types[attr]
@@ -39,10 +74,9 @@ class Artwork( unicode ):
if parent:
self.hostname = parent.get('hostname', parent.get('host', None))
- super(Artwork, self).__init__()
def __repr__(self):
- return u"<{0.imagetype} '{0}'>".format(self)
+ return u"<{0.imagetype} '{0.data}'>".format(self)
def __get__(self, inst, owner):
if inst is None:
@@ -50,13 +84,15 @@ class Artwork( unicode ):
return Artwork(self.attr, inst, self.imagetype)
def __set__(self, inst, value):
- super(Artwork, self).__set__(inst, value)
- self.parent[self.attr] = value
+ inst[self.attr] = value
+
+ def __delete__(self, inst):
+ inst[self.attr] = inst._defaults.get(self.attr, "")
@property
def exists(self):
be = FileOps(self.hostname, db = self.parent._db)
- return be.fileExists(self, self.imagetype)
+ return be.fileExists(unicode(self), self.imagetype)
def downloadFrom(self, url):
if self.parent is None:
diff --git a/mythtv/bindings/python/MythTV/system.py b/mythtv/bindings/python/MythTV/system.py
index 7417dd9..4631bb8 100644
--- a/mythtv/bindings/python/MythTV/system.py
+++ b/mythtv/bindings/python/MythTV/system.py
@@ -385,12 +385,12 @@ class Grabber( System ):
this method will return a fully populated object.
"""
try:
- if inetref.season and inetref.episode:
+ if (inetref.season is not None) and (inetref.episode is not None):
args = (inetref.inetref, inetref.season, inetref.episode)
else:
args = (inetref.inetref,)
except:
- if season and episode:
+ if (season is not None) and (episode is not None):
args = (inetref, season, episode)
else:
args = (inetref,)
diff --git a/mythtv/libs/libmythtv/ThreadedFileWriter.cpp b/mythtv/libs/libmythtv/ThreadedFileWriter.cpp
index c756832..dd6d73d 100644
--- a/mythtv/libs/libmythtv/ThreadedFileWriter.cpp
+++ b/mythtv/libs/libmythtv/ThreadedFileWriter.cpp
@@ -482,7 +482,7 @@ void ThreadedFileWriter::DiskLoop(void)
locker.relock();
- if (!in_dtor)
+ if ((tot < sz) && !in_dtor)
bufferHasData.wait(locker.mutex(), 50);
}
diff --git a/mythtv/libs/libmythui/mythuiwebbrowser.cpp b/mythtv/libs/libmythui/mythuiwebbrowser.cpp
index 9894c11..0152a94 100644
--- a/mythtv/libs/libmythui/mythuiwebbrowser.cpp
+++ b/mythtv/libs/libmythui/mythuiwebbrowser.cpp
@@ -84,13 +84,6 @@ static void DestroyNetworkAccessManager(void)
{
if (networkManager)
{
- MythDownloadManager *dlmgr = GetMythDownloadManager();
- if (dlmgr)
- {
- LOG(VB_GENERAL, LOG_DEBUG, "Refreshing DLManager's Cookie Jar");
- dlmgr->refreshCookieJar(networkManager->cookieJar());
- }
-
delete networkManager;
networkManager = NULL;
}
@@ -265,7 +258,8 @@ MythWebPage::MythWebPage(QObject *parent)
MythWebPage::~MythWebPage()
{
- DestroyNetworkAccessManager();
+ LOG(VB_GENERAL, LOG_DEBUG, "Refreshing DLManager's Cookie Jar");
+ GetMythDownloadManager()->refreshCookieJar(networkManager->cookieJar());
}
bool MythWebPage::supportsExtension(Extension extension) const
diff --git a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
index 4ceee4e..fd8b795 100755
--- a/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
+++ b/mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
@@ -453,7 +453,20 @@ class _Mythtv_data:
return myth_systemrole , mythremote
-
+ def ProcessLogUrgency(self):
+ c = _DB.cursor()
+ c.execute("""SELECT level,count(level) FROM logging GROUP BY level""")
+ levels = ('EMERG', 'ALERT', 'CRIT', 'ERR',
+ 'WARNING', 'NOTICE', 'INFO') # ignore debugging from totals
+ counts = {}
+ total = 0.
+ for level,count in c.fetchall():
+ if level in range(len(levels)):
+ counts[levels[level]] = count
+ total += count
+ for k,v in counts.items():
+ counts[k] = v/total
+ return {'logurgency':counts}
@@ -470,6 +483,7 @@ class _Mythtv_data:
self._data.update(self.ProcessMySQL())
self._data.update(self.ProcessScheduler())
self._data.update(self.Processtuners())
+ self._data.update(self.ProcessLogUrgency())
self._data.theme = _SETTINGS.Theme
self._data.country = _SETTINGS.Country
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-16/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 17 May 2011 22:34:18 -0000 1.6
+++ .cvsignore 29 Oct 2012 20:35:13 -0000 1.7
@@ -1,12 +1 @@
-mythfrontend.png
-mythtv-setup.png
-mythplugins-0.21.tar.bz2
-mythtv-0.21.tar.bz2
-mythtv-0.22.tar.bz2
-mythplugins-0.22.tar.bz2
-mythtv-0.23.tar.bz2
-mythplugins-0.23.tar.bz2
-mythplugins-0.24.tar.bz2
-mythtv-0.24.tar.bz2
-mythplugins-0.24.1.tar.bz2
-mythtv-0.24.1.tar.bz2
+MythTV-mythtv-v0.25.3-0-g139bd59.tar.gz
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-16/mythtv.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mythtv.spec 25 Aug 2012 21:09:21 -0000 1.96
+++ mythtv.spec 29 Oct 2012 20:35:13 -0000 1.97
@@ -59,13 +59,13 @@
%define desktop_vendor RPMFusion
# Git revision and branch ID
-# 0.25 release: git tag v0.25.1
-%define _gitrev v0.25.2-15-g46cab93
+# output of "git describe"
+%define _gitrev v0.25.3-9-g117b611
%define branch fixes/0.25
# Mythtv and plugins from github.com
-%global githash1 g4e44650
-%global githash2 19087cb
+%global githash1 g139bd59
+%global githash2 4024b42
#
# Basic descriptive tags for this package:
@@ -76,12 +76,11 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.25.2
+Version: 0.25.3
%if "%{branch}" == "master"
Release: 0.1.git.%{_gitrev}%{?dist}
-#Release: 0.1.rc1%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -131,15 +130,16 @@
################################################################################
-# https://github.com/MythTV/mythtv/tarball/v0.25
+# https://github.com/MythTV/mythtv/tarball/v0.25.3
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
-Patch0: mythtv-0.25.2-fixes.patch
+Patch0: mythtv-0.25.3-fixes.patch
# Fixes for PHP 5.4
Patch1: mythtv-0.25.1-php54.patch
# Adapative HLS profile based on resolution.
Patch2: mythtv-0.25.1-hls_profile.patch
+Patch3: mythtv-0.25.2-hls_link.patch
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -813,6 +813,7 @@
%patch0 -p1 -b .mythtv
%patch1 -p1 -b .php54
%patch2 -p1 -b .hls_profile
+%patch3 -p1 -b .hls_link
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -1441,6 +1442,9 @@
%changelog
+* Mon Oct 29 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.3-1
+- Update to latest upstream release.
+
* Sat Aug 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-2
- Update to latest fixes/0.25.
- Fix mythbackend looking in the wrong directory for config.xml (BZ#2450).
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-16/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 25 Aug 2012 21:09:21 -0000 1.55
+++ sources 29 Oct 2012 20:35:13 -0000 1.56
@@ -1 +1 @@
-05d3402459bf7380cf54cc6066c149a3 MythTV-mythtv-v0.25.2-0-g4e44650.tar.gz
+dfd2d976856ab8ae3f798192c075aa84 MythTV-mythtv-v0.25.3-0-g139bd59.tar.gz
--- mythtv-0.25.2-fixes.patch DELETED ---
12 years
- 1
- 0
rpms/mythtv/F-17 mythtv-0.26-fixes.patch, NONE, 1.1 ChangeLog, 1.3, 1.4 mythtv.spec, 1.99, 1.100 sources, 1.55, 1.56 mysql.txt, 1.1, NONE mythtv-0.25.1-hls_profile.patch, 1.1, NONE mythtv-0.25.1-php54.patch, 1.1, NONE mythtv-0.25.2-fixes.patch, 1.2, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25064
Modified Files:
ChangeLog mythtv.spec sources
Added Files:
mythtv-0.26-fixes.patch
Removed Files:
mysql.txt mythtv-0.25.1-hls_profile.patch
mythtv-0.25.1-php54.patch mythtv-0.25.2-fixes.patch
Log Message:
* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
- Update to latest upstream release.
- Remove mysql.txt as it is no longer used.
- Fix lib -> lib64 replacement command to be more accurate and support mythzmq
- Add mythzmq stuff
mythtv-0.26-fixes.patch:
README.rst | 1
mythplugins/mytharchive/i18n/mytharchive_es_es.qm |binary
mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45
mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4
mythplugins/mythgame/i18n/mythgame_es_es.ts | 4
mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68
mythplugins/mythmusic/i18n/mythmusic_it.qm |binary
mythplugins/mythmusic/i18n/mythmusic_it.ts | 3790 +++++++---
mythplugins/mythweather/i18n/mythweather_es_es.qm |binary
mythplugins/mythweather/i18n/mythweather_es_es.ts | 3
mythplugins/mythweather/i18n/mythweather_pl.qm |binary
mythplugins/mythweather/i18n/mythweather_pl.ts | 3
mythtv/bindings/python/MythTV/altdict.py | 2
mythtv/bindings/python/MythTV/dataheap.py | 58
mythtv/bindings/python/MythTV/system.py | 4
mythtv/contrib/imports/mirobridge/mirobridge.py | 96
mythtv/i18n/mythfrontend_es_es.qm |binary
mythtv/i18n/mythfrontend_es_es.ts | 2180 +++--
mythtv/i18n/mythfrontend_pl.qm |binary
mythtv/i18n/mythfrontend_pl.ts | 2733 +++----
mythtv/libs/libmyth/mythcontext.cpp | 2
mythtv/libs/libmythbase/signalhandling.cpp | 8
mythtv/libs/libmythtv/ThreadedFileWriter.cpp | 2
mythtv/libs/libmythtv/mythplayer.cpp | 4
mythtv/libs/libmythui/mythscreenstack.cpp | 2
mythtv/libs/libmythui/mythuiimage.cpp | 3
mythtv/libs/libmythui/mythuitype.cpp | 7
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10
mythtv/programs/mythavtest/main.cpp | 5
mythtv/programs/mythbackend/main.cpp | 5
mythtv/programs/mythbackend/main_helpers.cpp | 4
mythtv/programs/mythbackend/mainserver.cpp | 16
mythtv/programs/mythccextractor/main.cpp | 5
mythtv/programs/mythcommflag/main.cpp | 5
mythtv/programs/mythfilldatabase/main.cpp | 5
mythtv/programs/mythfrontend/guidegrid.cpp | 17
mythtv/programs/mythfrontend/main.cpp | 5
mythtv/programs/mythjobqueue/main.cpp | 5
mythtv/programs/mythlcdserver/main.cpp | 5
mythtv/programs/mythlogserver/main.cpp | 5
mythtv/programs/mythmediaserver/main.cpp | 5
mythtv/programs/mythmetadatalookup/main.cpp | 5
mythtv/programs/mythpreviewgen/main.cpp | 5
mythtv/programs/mythshutdown/main.cpp | 5
mythtv/programs/mythtranscode/main.cpp | 5
mythtv/programs/mythtv-setup/backendsettings.cpp | 6
mythtv/programs/mythtv-setup/main.cpp | 5
mythtv/programs/mythutil/main.cpp | 6
mythtv/programs/mythwelcome/main.cpp | 5
mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 20
mythtv/programs/scripts/metadata/Movie/tmdb3.py | 103
51 files changed, 5902 insertions(+), 3379 deletions(-)
--- NEW FILE mythtv-0.26-fixes.patch ---
README.rst | 1 +
mythplugins/mytharchive/i18n/mytharchive_es_es.qm | Bin 36188 -> 36136 bytes
mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45 +-
mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4 +-
mythplugins/mythgame/i18n/mythgame_es_es.ts | 4 +-
mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68 +-
mythplugins/mythmusic/i18n/mythmusic_it.qm | Bin 55341 -> 67158 bytes
mythplugins/mythmusic/i18n/mythmusic_it.ts | 3790 +++++++++++++++-----
mythplugins/mythweather/i18n/mythweather_es_es.qm | Bin 23630 -> 23631 bytes
mythplugins/mythweather/i18n/mythweather_es_es.ts | 3 +-
mythplugins/mythweather/i18n/mythweather_pl.qm | Bin 23846 -> 23847 bytes
mythplugins/mythweather/i18n/mythweather_pl.ts | 3 +-
mythtv/bindings/python/MythTV/altdict.py | 2 +-
mythtv/bindings/python/MythTV/dataheap.py | 58 +-
mythtv/bindings/python/MythTV/system.py | 4 +-
mythtv/contrib/imports/mirobridge/mirobridge.py | 96 +-
mythtv/i18n/mythfrontend_es_es.qm | Bin 669897 -> 672530 bytes
mythtv/i18n/mythfrontend_es_es.ts | 2180 ++++++------
mythtv/i18n/mythfrontend_pl.qm | Bin 350611 -> 354449 bytes
mythtv/i18n/mythfrontend_pl.ts | 2733 ++++++++-------
mythtv/libs/libmyth/mythcontext.cpp | 2 +-
mythtv/libs/libmythbase/signalhandling.cpp | 8 +-
mythtv/libs/libmythtv/ThreadedFileWriter.cpp | 2 +-
mythtv/libs/libmythtv/mythplayer.cpp | 4 +-
mythtv/libs/libmythui/mythscreenstack.cpp | 2 +-
mythtv/libs/libmythui/mythuiimage.cpp | 3 +-
mythtv/libs/libmythui/mythuitype.cpp | 7 +-
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10 +-
mythtv/programs/mythavtest/main.cpp | 5 +-
mythtv/programs/mythbackend/main.cpp | 5 +-
mythtv/programs/mythbackend/main_helpers.cpp | 4 +-
mythtv/programs/mythbackend/mainserver.cpp | 16 +-
mythtv/programs/mythccextractor/main.cpp | 5 +-
mythtv/programs/mythcommflag/main.cpp | 5 +-
mythtv/programs/mythfilldatabase/main.cpp | 5 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 17 +-
mythtv/programs/mythfrontend/main.cpp | 5 +-
mythtv/programs/mythjobqueue/main.cpp | 5 +-
mythtv/programs/mythlcdserver/main.cpp | 5 +-
mythtv/programs/mythlogserver/main.cpp | 5 +-
mythtv/programs/mythmediaserver/main.cpp | 5 +-
mythtv/programs/mythmetadatalookup/main.cpp | 5 +-
mythtv/programs/mythpreviewgen/main.cpp | 5 +-
mythtv/programs/mythshutdown/main.cpp | 5 +-
mythtv/programs/mythtranscode/main.cpp | 5 +-
mythtv/programs/mythtv-setup/backendsettings.cpp | 6 +-
mythtv/programs/mythtv-setup/main.cpp | 5 +-
mythtv/programs/mythutil/main.cpp | 6 +-
mythtv/programs/mythwelcome/main.cpp | 5 +-
.../distros/mythtv_data/data_mythtv.py | 20 +-
mythtv/programs/scripts/metadata/Movie/tmdb3.py | 103 +-
51 files changed, 5902 insertions(+), 3379 deletions(-)
diff --git a/README.rst b/README.rst
index a151d89..576e0dc 100644
--- a/README.rst
+++ b/README.rst
@@ -20,3 +20,4 @@ Useful project links
- `Mailing lists <http://www.mythtv.org/mailman/listinfo>`_
- `IRC <irc://freenode.net/mythtv-users>`_ at Freenode.net, #mythtv-users
+
diff --git a/mythplugins/mytharchive/i18n/mytharchive_es_es.qm b/mythplugins/mytharchive/i18n/mytharchive_es_es.qm
index 362945a..9bc0687 100644
Binary files a/mythplugins/mytharchive/i18n/mytharchive_es_es.qm and b/mythplugins/mytharchive/i18n/mytharchive_es_es.qm differ
diff --git a/mythplugins/mytharchive/i18n/mytharchive_es_es.ts b/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
index 51f654c..9387d6d 100644
--- a/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
+++ b/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
@@ -829,7 +829,7 @@ Por Favor, Espere...</translation>
<translation>el título va aquí</translation>
</message>
<message>
- <location filename="themestrings.h" line="94"/>
+ <location filename="themestrings.h" line="93"/>
<source>x.xx Gb</source>
<translation>x,xx Gb</translation>
</message>
@@ -1209,52 +1209,47 @@ Por Favor, Espere...</translation>
<translation>x,xx GB</translation>
</message>
<message>
- <location filename="themestrings.h" line="93"/>
- <source>Ok</source>
- <translation>Aceptar</translation>
- </message>
- <message>
- <location filename="themestrings.h" line="95"/>
+ <location filename="themestrings.h" line="94"/>
<source>Select Destination:</source>
<translation>Seleccionar Destino:</translation>
</message>
<message>
- <location filename="themestrings.h" line="96"/>
+ <location filename="themestrings.h" line="95"/>
<source>Parental level: %1</source>
<translation>Nivel parental: %1</translation>
</message>
<message>
- <location filename="themestrings.h" line="97"/>
+ <location filename="themestrings.h" line="96"/>
<source>Old size:</source>
<translation>Tamaño anterior:</translation>
</message>
<message>
- <location filename="themestrings.h" line="98"/>
+ <location filename="themestrings.h" line="97"/>
<source>New size:</source>
<translation>Tamaño nuevo:</translation>
</message>
<message>
- <location filename="themestrings.h" line="99"/>
+ <location filename="themestrings.h" line="98"/>
<source>Select a theme:</source>
<translation>Seleccione un tema:</translation>
</message>
<message>
- <location filename="themestrings.h" line="100"/>
+ <location filename="themestrings.h" line="99"/>
<source>Menu</source>
<translation>Menú</translation>
</message>
<message>
- <location filename="themestrings.h" line="101"/>
+ <location filename="themestrings.h" line="100"/>
<source>Chapter</source>
<translation>Capítulo</translation>
</message>
<message>
- <location filename="themestrings.h" line="102"/>
+ <location filename="themestrings.h" line="101"/>
<source>Detail</source>
<translation>Detalles</translation>
</message>
<message>
- <location filename="themestrings.h" line="103"/>
+ <location filename="themestrings.h" line="102"/>
<source>Select File to Import</source>
<translation>Seleccionar Archivo a Importar</translation>
</message>
@@ -1264,52 +1259,52 @@ Por Favor, Espere...</translation>
<translation>Añadir vídeo</translation>
</message>
<message>
- <location filename="themestrings.h" line="104"/>
+ <location filename="themestrings.h" line="103"/>
<source>Channel ID:</source>
<translation>ID de Canal:</translation>
</message>
<message>
- <location filename="themestrings.h" line="105"/>
+ <location filename="themestrings.h" line="104"/>
<source>Channel Number:</source>
<translation>Número de Canal:</translation>
</message>
<message>
- <location filename="themestrings.h" line="106"/>
+ <location filename="themestrings.h" line="105"/>
<source>Create DVD</source>
<translation>Crear DVD</translation>
</message>
<message>
- <location filename="themestrings.h" line="107"/>
+ <location filename="themestrings.h" line="106"/>
<source>Create Archive</source>
<translation>Crear Archivo</translation>
</message>
<message>
- <location filename="themestrings.h" line="108"/>
+ <location filename="themestrings.h" line="107"/>
<source>Encode Video File</source>
<translation>Codificar Archivo de Vídeo</translation>
</message>
<message>
- <location filename="themestrings.h" line="109"/>
+ <location filename="themestrings.h" line="108"/>
<source>Import Archive</source>
<translation>Importar Archivo</translation>
</message>
<message>
- <location filename="themestrings.h" line="110"/>
+ <location filename="themestrings.h" line="109"/>
<source>Archive Utilities</source>
<translation>Aplicaciones de Archivo</translation>
</message>
<message>
- <location filename="themestrings.h" line="111"/>
+ <location filename="themestrings.h" line="110"/>
<source>Show Log Viewer</source>
<translation>Mostrar Visor del Registro</translation>
</message>
<message>
- <location filename="themestrings.h" line="112"/>
+ <location filename="themestrings.h" line="111"/>
<source>Play Created DVD</source>
<translation>Reproducir el DVD Creado</translation>
</message>
<message>
- <location filename="themestrings.h" line="113"/>
[...20776 lines suppressed...]
diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
index 6a133f5..853fbe4 100755
--- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py
+++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
@@ -11,19 +11,21 @@
#-----------------------
__title__ = "TheMovieDB.org V3"
__author__ = "Raymond Wagner"
-__version__ = "0.3.0"
+__version__ = "0.3.2"
# 0.1.0 Initial version
# 0.2.0 Add language support, move cache to home directory
# 0.3.0 Enable version detection to allow use in MythTV
-
-from MythTV.tmdb3 import searchMovie, Movie, Collection, set_key, set_cache, set_locale
-from MythTV import VideoMetadata
+# 0.3.1 Add --test parameter for proper compatibility with mythmetadatalookup
+# 0.3.2 Add --area parameter to allow country selection for release date and
+# parental ratings
from optparse import OptionParser
-from lxml import etree
import sys
-def buildSingle(inetref):
+def buildSingle(inetref, opts):
+ from MythTV.tmdb3 import Movie
+ from MythTV import VideoMetadata
+ from lxml import etree
movie = Movie(inetref)
tree = etree.XML(u'<metadata></metadata>')
mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
@@ -35,12 +37,30 @@ def buildSingle(inetref):
for i,j in mapping:
if getattr(movie, j):
setattr(m, i, getattr(movie, j))
+
+ releases = movie.releases.items()
+
+ if opts.country:
+ for alt in movie.alternate_titles:
+ if alt.country == opts.country:
+ m.title = alt.title
+ break
+ try:
+ # resort releases with selected country at top to ensure it
+ # is selected by the metadata libraries
+ index = zip(*releases)[0].index(opts.country)
+ releases.insert(0, releases.pop(index))
+ except ValueError:
+ pass
+ else:
+ m.releasedate = releases[0][1].releasedate
+
m.inetref = str(movie.id)
- if movie.releasedate:
- m.year = movie.releasedate.year
if movie.collection:
m.collectionref = str(movie.collection.id)
- for country, release in movie.releases.items():
+ if movie.releasedate:
+ m.year = movie.releasedate.year
+ for country, release in releases:
if release.certification:
m.certifications[country] = release.certification
for genre in movie.genres:
@@ -70,11 +90,15 @@ def buildSingle(inetref):
xml_declaration=True))
sys.exit()
-def buildList(query):
+def buildList(query, opts):
# TEMPORARY FIX:
# replace all dashes from queries to work around search behavior
# as negative to all text that comes afterwards
query = query.replace('-',' ')
+
+ from MythTV.tmdb3 import searchMovie
+ from MythTV import VideoMetadata
+ from lxml import etree
results = searchMovie(query)
tree = etree.XML(u'<metadata></metadata>')
mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
@@ -89,6 +113,10 @@ def buildList(query):
if getattr(res, j):
setattr(m, i, getattr(res, j))
m.inetref = str(res.id)
+ #TODO:
+ # should releasedate and year be pulled from the country-specific data
+ # or should it be left to the default information to cut down on
+ # traffic from searches
if res.releasedate:
m.year = res.releasedate.year
if res.backdrop:
@@ -109,7 +137,10 @@ def buildList(query):
xml_declaration=True))
sys.exit(0)
-def buildCollection(inetref):
+def buildCollection(inetref, opts):
+ from MythTV.tmdb3 import Collection
+ from MythTV import VideoMetadata
+ from lxml import etree
collection = Collection(inetref)
tree = etree.XML(u'<metadata></metadata>')
m = VideoMetadata()
@@ -129,6 +160,7 @@ def buildCollection(inetref):
sys.exit()
def buildVersion():
+ from lxml import etree
version = etree.XML(u'<grabber></grabber>')
etree.SubElement(version, "name").text = __title__
etree.SubElement(version, "author").text = __author__
@@ -142,43 +174,78 @@ def buildVersion():
xml_declaration=True))
sys.exit(0)
-def main():
- set_key('c27cb71cff5bd76e1a7a009380562c62')
- set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
+def performSelfTest():
+ err = 0
+ try:
+ import MythTV
+ except:
+ err = 1
+ print ("Failed to import MythTV bindings. Check your `configure` output "
+ "to make sure installation was not disabled due to external "
+ "dependencies")
+ try:
+ import MythTV.tmdb3
+ except:
+ err = 1
+ print ("Failed to import PyTMDB3 library. This should have been included "
+ "with the python MythTV bindings.")
+ try:
+ import lxml
+ except:
+ err = 1
+ print "Failed to import python lxml library."
+
+ if not err:
+ print "Everything appears in order."
+ sys.exit(err)
+def main():
parser = OptionParser()
parser.add_option('-v', "--version", action="store_true", default=False,
dest="version", help="Display version and author")
+ parser.add_option('-t', "--test", action="store_true", default=False,
+ dest="test", help="Perform self-test for dependencies.")
parser.add_option('-M', "--movielist", action="store_true", default=False,
dest="movielist", help="Get Movies matching search.")
parser.add_option('-D', "--moviedata", action="store_true", default=False,
dest="moviedata", help="Get Movie data.")
parser.add_option('-C', "--collection", action="store_true", default=False,
dest="collectiondata", help="Get Collection data.")
- parser.add_option( "-l", "--language", metavar="LANGUAGE", default=u'en',
+ parser.add_option('-l', "--language", metavar="LANGUAGE", default=u'en',
dest="language", help="Specify language for filtering.")
+ parser.add_option('-a', "--area", metavar="COUNTRY", default=None,
+ dest="country", help="Specify country for custom data.")
opts, args = parser.parse_args()
if opts.version:
buildVersion()
+ if opts.test:
+ performSelfTest()
+
+ from MythTV.tmdb3 import set_key, set_cache, set_locale
+ set_key('c27cb71cff5bd76e1a7a009380562c62')
+ set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
+
if opts.language:
set_locale(language=opts.language, fallthrough=True)
+ if opts.country:
+ set_locale(country=opts.country, fallthrough=True)
if (len(args) != 1) or (args[0] == ''):
sys.stdout.write('ERROR: tmdb3.py requires exactly one non-empty argument')
sys.exit(1)
if opts.movielist:
- buildList(args[0])
+ buildList(args[0], opts)
if opts.moviedata:
- buildSingle(args[0])
+ buildSingle(args[0], opts)
if opts.collectiondata:
- buildCollection(args[0])
+ buildCollection(args[0], opts)
if __name__ == '__main__':
main()
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 25 Aug 2012 19:59:17 -0000 1.3
+++ ChangeLog 29 Oct 2012 17:47:41 -0000 1.4
@@ -1,129 +1,275 @@
-commit 46cab93562429cd19029402a2387f63a72aeb898
-Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Tue Jul 31 14:21:22 2012 -0400
+commit e3087dda66175a6b7308ad5a5e80a35ff7d72fd3
+Author: Jonatan Lindblad <jlindblad(a)mythtv.org>
+Date: Sun Oct 28 21:59:38 2012 +0100
- Correct --printexpire option in mythbackend.
+ Internet Content: Remove deprecated YouTube categories
- This corrects logic that was accidentally inverted in 8bc8dd54, and
- allows `mythbackend --printexpire` to be used again.
- (cherry picked from commit a9f18c63bfb23494ee83a8ba76d82fc320617067)
+ Fixes #11193
+ (cherry picked from commit 7c903d2a90d7962fa6e1ee856d506539ce17c1c8)
+
+commit 0de21aa876e3117ff98499c5a502affc52b5277e
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Oct 25 15:16:38 2012 -0400
+
+ Tweak DictData behavior to properly function with Properties.
+ (cherry picked from commit 662b5e83cfa103fc3aed86c194b2fa2c6b9424d8)
-commit 8ab229a8bed860fb0855797c683655a7465e2ee4
-Merge: a4cdc9e 1c496c8
+commit 5e0099555dac1c16f7a76f46996675fa99c7a6b7
Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Tue Jul 31 14:22:32 2012 -0400
+Date: Thu Oct 25 15:14:27 2012 -0400
+
+ Correct handling of Artwork when database field is set to NULL.
+ (cherry picked from commit 4646e7f56fc97f62d05d42b5896e8eceb361492e)
+
+commit 744a595db2273affca4030f4e8879860d72d4683
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Oct 23 15:51:05 2012 -0400
+
+ Use 'unicode' rather than 'str' for UTF8 compatibility.
+ (cherry picked from commit 0bc83db48ec08b8df576c6ecbf1049567d34ab7a)
- Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+commit 35389d8f177c94a7b6381b5a63cfcb997d22dc66
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Oct 23 15:42:31 2012 -0400
-commit 1c496c81662eabda444452071eb18f2fd375d4d0
-Author: Kyle <klillis(a)gmail.com>
-Date: Mon Jul 30 13:34:11 2012 -0400
+ Fix immutable methods in Artwork class.
+
+ This fixes an issue with several immutable methods in the Artwork class,
+ inherited from the parent UserString class. As the Artwork class is
+ modified for use as a property, and not intended to be called directly
+ for storage of a string, the inherited UserString methods that returned
+ a new instance using the __class__ attribute would fail. This adds a
+ __new__ method that detects such uses and forces the call to return a
+ standard str type instead.
+ (cherry picked from commit 9f66fa0f9a4d9d759b9fdb44f411a4dc1a0748cb)
+
+commit 163e0e629095401268cf67309d16987ded6a0d72
+Author: Bill <billstuff2001(a)sbcglobal.net>
+Date: Fri Oct 12 13:47:27 2012 -0400
- Fixes #10897. Clear paused when we unpause FirewireRecorder.
+ Fixes #11061. Speed up TFW recovery after falling behind on writes.
Signed-off-by: Daniel Thor Kristjansson <danielk(a)cuymedia.net>
-commit 9c199a42258f2a19dd1c8d3b934e6eb04f1757ce
-Author: Daniel Thor Kristjansson <dkristjansson(a)mythtv.org>
-Date: Tue Jul 24 12:13:16 2012 -0400
+commit 143e2de7da6c88d8c9f736e700df2e71130f0882
+Author: Jonatan Lindblad <jlindblad(a)mythtv.org>
+Date: Sun Oct 21 17:30:38 2012 +0200
+
+ MythUI: Fix double rendering of fading screens
+ (cherry picked from commit da065e42b2cfa3ea875df1b5c36ce34422f379a0)
+
+commit 2870590667b4b3b3e13b171c5e81a805d30512ce
+Author: Jonatan Lindblad <jlindblad(a)mythtv.org>
+Date: Sun Oct 21 13:29:12 2012 +0200
- Fixes #10870. Fix Start/Stop race condition in StreamHandler.
+ MythUI: Fix potential use after free when leaving a web page
- This is a backport of [445faaa47].
+ It's not safe to delete a QNetworkAccessManager before the QWebPage it is being
+ used with since any outstanding QNetworkReplys will be deleted, causing
+ QWebPage to potentially access free memory.
+
+ Fixes #11168.
+ (cherry picked from commit 83e88bc0abe21f54daace479ac921c352710c9de)
-commit a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
-Author: Stuart Morgan <smorgan(a)mythtv.org>
-Date: Sun Jul 29 12:42:41 2012 +0100
+commit 8b7f6ce5cb97702718d69bea8e582f5dc26746c9
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Fri Oct 19 20:47:32 2012 +1100
+
+ Fix OS X compilation
+
+ Signal SIGRTMIN doesn't exist under OS X so make all this code conditional.
+
+ [cherry-picked from 9f65a657827790687b8ac24daf7a4c581e7535a3]
- Restore setup pincode following [57adc5d120] - 'Flatten the Setup Menus in the default menu theme' which dropped util_menu.xml but failed to carry over the <password> markup.
- (cherry picked from commit 134417fe3bf7170f3419d2388a6c26afe16c4927)
+commit fdfd45035d322bba1c537546dcf0c392dc1b35d5
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Oct 19 12:12:51 2012 -0400
-commit 3256849b14cc882536a153e7fbe4724adf03260c
-Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
-Date: Tue Jul 24 10:56:15 2012 -0700
+ Add -a parameter to tmdb3.py.
+ (cherry picked from commit 150e57259794084ae6d819ff72cb9977b7cf20bf)
- Subtitles: backport some code to enable cc608 TT deprecation log message.
+commit bfc3dfc12d67104f37adafc9d5ad148a13db83c1
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Oct 19 02:40:57 2012 -0400
-commit 39fad46248bbcbe5ab27068e73fb7c5a91bc155b
-Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
-Date: Tue Jul 24 08:23:53 2012 -0700
+ Add -t parameter to tmdb3.py.
+ (cherry picked from commit 144c4f5142ad783b5fce7814716816576ee232a7)
+
+commit 474107b04853831df6e7a0a3ca869a64097602bb
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Oct 18 15:20:35 2012 -0400
- Subtitles: Put a "DEPRECATED_608_TELETEXT" message into the logs.
+ Fix setting of values to Artwork property.
- Support for CEA-608 teletext captions is to be removed. Allow users
- to check whether they would be affected. Refs #10786.
- (cherry picked from commit 7b1aef85ec92658acb91c1ff019aed909e5df30a)
+ This makes the Artwork property derived from a MutableString rather than
+ a unicode type, allowing the setting of values to work properly, rather
+ than merely by chance, and correcting an issue where importMetadata
+ would not apply a coverart value to Video Library entries.
+ (cherry picked from commit e4b46f0cdc1a18ee5dca94e29229531d928a6dc1)
-commit 9e0d839be7667056dc65b79711dda84159a1b13d
-Author: Stuart Morgan <smorgan(a)mythtv.org>
-Date: Tue Jul 24 14:11:47 2012 +0100
+commit bff8eb1a1893335f6b96eb6eb8ebd1d567feb9cb
+Author: Antonio Marcos Lopez Alonso <amlopezalonso(a)gmail.com>
+Date: Tue Oct 16 06:50:16 2012 -0400
+
+ Updated Spanish/Spain MythFrontend, MythArchive and MythWeather
+ translation from Antonio Marcos Lopez Alonso.
+
+ Backport of af9d36763 to 0.26-fixes
+
+ Thank you Antonio!
+
+ Closes #11179
+
+ Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
- Set m_cdWatcher to NULL after deletion, fixes segfault on exiting frontend. Fixes #10936
- (cherry picked from commit de851dd273eaa80689a427f915c7db40d015e0ba)
+commit fd6e25bfe3074507a5f27133dddf34ccd7dbb988
+Author: Nicolas Riendeau <nriendeau(a)mythtv.org>
+Date: Mon Oct 15 19:31:32 2012 -0400
-commit 10a68895e1fcd5c409058d2eb61fe59e78736235
-Author: Stuart Morgan <smorgan(a)mythtv.org>
-Date: Sun Jul 22 23:24:40 2012 +0100
+ Updated Polish Mythfrontend and MythWeather translation
+ from Warpme
+
+ Thank you Warpme and porbas!
+
+ Refs #11178
+
+commit 280e7efd82fe2daccee8d5fa542e4610af36124a
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Sat Oct 13 16:30:23 2012 -0700
- Fix segfault after music scan completes.
- (cherry picked from commit b2379ae9b8d42c23c3feee26b52a1f0a2ebef394)
+ Fixes #11151 by correcting a float-to-integer truncation problem.
+ (cherry picked from commit 4a09ca11c47137a88355a961efd5131c2157d4d7)
-commit ed58b3a818a1796340ba0f085a53159eb1d52266
-Author: Stuart Morgan <smorgan(a)mythtv.org>
-Date: Sat Jul 21 23:53:41 2012 +0100
+commit aae34c428d30413b6f62aa2279a9189e399ed430
+Author: Morris Cavestro <morriscavestro(a)yahoo.it>
+Date: Mon Oct 8 13:51:39 2012 -0400
- Fix for Synaesthesia memory corruption
+ Updated Italian MythMusic translation
+ from Morris Cavestro
- We were allocating just half the required space and consequently
- writing beyond the end of the array. This consistently caused
- segfaults for me when using the Synaesthesia visualiser.
+ (Backport to 0.26-fixes)
- This fix appears to be consistent with the code used in other projects
- which were also derived from the original Synaesthia project.
+ Thank you Morris!
- e.g. GStreamer/Source/gst-plugins-ugly/gst/synaesthesia/synaescope.c
- (cherry picked from commit e331017f2d1ee9be82da9c0b64ca4435ec3efd1e)
+ Closes #11167
+
+ Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
-commit a4cdc9e01295991056cdc8c5411e70937b1a4842
-Merge: 450ed91 f0e2ad8
+commit 90ba02c17dd993792f29fb4ac5d2d71fce9670b3
+Merge: ff922bb 624ad5a
Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Fri Jul 20 21:06:48 2012 -0400
+Date: Wed Oct 10 11:01:53 2012 -0400
- Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+ Merge branch 'fixes/0.26' of code.mythtv.org:mythtv into fixes/0.26
-commit f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63
-Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
-Date: Wed Jul 18 20:49:11 2012 +1000
+commit ff922bb074b425d086324b7d89db348f90d623dd
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Wed Oct 10 10:52:24 2012 -0400
- Make AllowLinkLocal default to true
+ Add reporting of logging volume to Smolt.
- Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+ This reports the logging volume as a percentage of the total amount
+ stored in the database, for each urgency level. This is intended as a
+ simple metric to determine stability of MythTV, as higher counts of
+ higher urgency levels will indicate an increase in problems seen by the
+ user base.
+ (cherry picked from commit 5f90b1d62c4d692a6c23ae22ab2047db85e6572e)
-commit 4b82e27e6c89bac9d60c3a56f1d924979c80c746
-Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Wed Jul 18 01:50:46 2012 -0400
+commit 624ad5a3533ba34033debb37f0058da0670cf4e1
+Author: Jesse Crews <jcrews(a)gridlox.net>
+Date: Tue Oct 9 10:59:27 2012 +0100
+
+ Fix mythbackend not exiting after network initialization failure. Fixes #11163
+
+ Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org>
+
+commit 2d2932ac11ed6d01f05f502a8e373455774ba46a
+Author: Lawrence Rust <lvr(a)softsystem.co.uk>
+Date: Sun May 6 12:33:35 2012 +0200
+
+ libmythui: Fix a redraw bug in MythUIType
+
+ While evaluating the ATI Catalyst 'TearFree Desktop' option I noticed
+ that sometimes a keypress was apparently being held up until the time
+ on the main menu was updated. Initially I thought that this was a lirc
+ or fglrx issue, but on investigation it turned out that MythMainWindow::animate
+ was requesting updates for empty repaint regions. Delving further
+ showed that MythUIType::Draw was resetting m_DirtyRegion to empty
+ even if the clipRect was smaller, thus leaving unpainted regions.
+
+ m_DirtyRegion may be extended by HandleMovementPulse, SetRedraw
+ or SetChildNeedsRedraw etc AFTER GetDirtyArea is called.
+ So when MythUIType::Draw is called, clipRect may not include the whole
+ of m_DirtyRegion.
+
+ This patch subtracts the Draw clipRect from m_DirtyRegion instead of
+ simply emtying it.
+
+ Fixes #10695
+
+ Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk>
+ Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org>
+ (cherry picked from commit 39984eb579369f6cb25cd8f57acb8b23ebcccfc6)
+
+commit 52c48f983ca3175be983bdaa8c0072b736315d3c
+Author: Xavier Hervy <xavier.hervy(a)gmail.com>
+Date: Sun Oct 7 19:19:54 2012 +0100
- Correct bad copy/paste in ServerPool.
+ Allow adding a channel to an empty channel group from the guide. Update the cached channel group list after adding or removing a channel. Fixes #10411
- Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+ Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org>
+ (cherry picked from commit 9d5aabc1ed42156bf23a9d0afac0b31fdaedc5e1)
-commit e4ba7d74aee6bd437e747772046a8836fa9ae5cb
+commit 4c67cedbea9e4b18d7688f30af02bd46e65cd07d
Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Sat Jul 14 01:57:46 2012 -0400
+Date: Sat Oct 6 13:42:21 2012 -0400
- Rework IP selection so link-local is always used.
+ Read in dbPingHost value from config.xml.
- This adds an option to mythtv-setup that makes link-local addresses
- listened to by default. This behavior can still be disabled, to block
- off network access.
+ Fixes #11148
+ (cherry picked from commit 65a720c9b830ab77bbd2931e03fb428e05dee6f9)
+
+commit ad5bb8b0929d546ac91324ccee5e7f7f2a49742e
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sat Oct 6 12:40:36 2012 +0100
+
+ Only set the BackendServerIP6 setting to ::1 by default if that address is available, otherwise leave it blank
+
+commit 6b541e74da22ff4daa28dd13425bcc9ffe2c7303
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sat Oct 6 11:36:59 2012 +0100
+
+ Log an error if we are unable to find IPv4 or IPv6 addresses, only
+ exit if we are unable to find any address to bind to
+
+commit dd0521ec029f5e5413592e93b3beff946fb5499f
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Sat Oct 6 04:28:48 2012 -0400
+
+ Fix single episode grabber for season 0 specials.
- Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+ This makes the check for arguments to grabInetref() look specifically
+ for None, rather than boolean False, to prevent false positives when
+ dealing with specials that have a season of 0.
+ (cherry picked from commit 7da754ad0d350988f324c239477a6587bf88ba1c)
-commit 450ed915d3a13b84489ecdebdad6fca18fc8c312
-Author: GDragon <gdragon(a)jetcom.org>
-Date: Mon Jul 9 15:33:31 2012 -0400
+commit c744347675573dfc690cb263353b3ccc4a950a1a
+Author: R.D. Vaughan <r.d.vaughan(a)rogers.com>
+Date: Tue Oct 2 13:29:55 2012 -0400
- Properly set job type in fromProgram and fromRecorded methods.
+ Adjust to datetime issues with MythTV v0.26's move to UTC datetimes in DB
Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
- (cherry picked from commit 868a566c1d635be3e60f83438f87b6f21d9f1780)
+ (cherry picked from commit fcf6da5608cc5621a7bee48120d988352f34189f)
+
+commit a49c750cfc1a2d3f0b8a46f98e75a0e79b3a79fc
+Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
+Date: Tue Oct 2 13:53:03 2012 -0700
+
+ Force a commit to fixes/0.26 to test the tagging
+
+commit b4deb185994d6388b55cea18aa3e861c71541101
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Tue Oct 2 12:05:20 2012 +0100
+
+ Prevent a segfault in MythUIImage, this doesn't fix the root cause of the problem but at least we won't crash. Refs #11047
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/mythtv.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mythtv.spec 25 Aug 2012 19:59:17 -0000 1.99
+++ mythtv.spec 29 Oct 2012 17:47:41 -0000 1.100
@@ -1,4 +1,3 @@
-#
# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
#
# by: Chris Petersen <rpm(a)forevermore.net>
@@ -60,12 +59,12 @@
# Git revision and branch ID
# 0.25 release: git tag v0.25.1
-%define _gitrev v0.25.2-15-g46cab93
-%define branch fixes/0.25
+%define _gitrev v0.26.0-28-ge3087dd
+%define branch fixes/0.26
# Mythtv and plugins from github.com
-%global githash1 g4e44650
-%global githash2 19087cb
+%global githash1 g6c3ae81
+%global githash2 d2f9798
#
# Basic descriptive tags for this package:
@@ -76,12 +75,11 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.25.2
+Version: 0.26.0
%if "%{branch}" == "master"
Release: 0.1.git.%{_gitrev}%{?dist}
-#Release: 0.1.rc1%{?dist}
%else
-Release: 2%{?dist}
+Release: 1%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -131,15 +129,10 @@
################################################################################
-# https://github.com/MythTV/mythtv/tarball/v0.25
+# https://github.com/MythTV/mythtv/tarball/v0.26
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
-Patch0: mythtv-0.25.2-fixes.patch
-
-# Fixes for PHP 5.4
-Patch1: mythtv-0.25.1-php54.patch
-# Adapative HLS profile based on resolution.
-Patch2: mythtv-0.25.1-hls_profile.patch
+Patch0: mythtv-0.26-fixes.patch
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -152,7 +145,6 @@
Source107: mythfrontend.desktop
Source108: mythtv-setup.png
Source109: mythtv-setup.desktop
-Source110: mysql.txt
Source111: 99-mythbackend.rules
@@ -181,6 +173,7 @@
BuildRequires: qt-webkit-devel
BuildRequires: qt-devel >= 4.6
BuildRequires: phonon-devel
+BuildRequires: libuuid-devel
BuildRequires: lm_sensors-devel
BuildRequires: lirc-devel
@@ -349,7 +342,8 @@
Requires: php-MythTV = %{version}-%{release}
Requires: python-MythTV = %{version}-%{release}
Requires: mythplugins = %{version}-%{release}
-Requires: mythweb
+Requires: mythweb = %{version}
+Requires: mythffmpeg = %{version}-%{release}
Requires: mysql-server >= 5, mysql >= 5
Requires: xmltv
@@ -578,6 +572,19 @@
This package contains components needed by multiple other MythTV components.
################################################################################
+################################################################################
+
+%package -n mythffmpeg
+Summary: MythTV build of FFmpeg
+Group: Applications/Multimedia
+
+%description -n mythffmpeg
+Several MythTV utilities interact with FFmpeg, which changes its parameters
+often enough to make it a hassle to support the variety of versions used by
+MythTV users. This is a snapshot of the FFmpeg code so that MythTV utilities
+can interact with a known verion.
+
+################################################################################
%if %{with_perl}
@@ -805,14 +812,10 @@
# Replace static lib paths with %{_lib} so we build properly on x86_64
# systems, where the libs are actually in lib64.
if [ "%{_lib}" != "lib" ]; then
- grep -rlZ '/lib/' . | xargs -r0 sed -i -e 's,/lib/,/%{_lib}/,g'
- grep -rlZ '/lib$' . | xargs -r0 sed -i -e 's,/lib$,/%{_lib},'
- grep -rlZ '/lib ' . | xargs -r0 sed -i -e 's,/lib ,/%{_lib} ,g'
+ find \( -name 'configure' -o -name '*pro' -o -name 'Makefile' \) -exec sed -r -i -e 's,/lib\b,/%{_lib},g' {} \+
fi
%patch0 -p1 -b .mythtv
-%patch1 -p1 -b .php54
-%patch2 -p1 -b .hls_profile
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -948,6 +951,7 @@
-exec sed -i -e "s,DEPLIBS = \$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \
-exec sed -i -e "s,\$\${PREFIX}/include/mythtv,$temp%{_includedir}/mythtv," {} \;
echo "INCLUDEPATH -= \$\${PREFIX}/include" >> settings.pro
+ echo "INCLUDEPATH -= \$\${SYSROOT}/\$\${PREFIX}/include" >> settings.pro
echo "INCLUDEPATH -= %{_includedir}" >> settings.pro
echo "INCLUDEPATH += $temp%{_includedir}" >> settings.pro
echo "INCLUDEPATH += %{_includedir}" >> settings.pro
@@ -1040,8 +1044,7 @@
# Fix permissions on executable python bindings
# chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth*.py
-# mysql.txt and other config/init files
- install -m 0644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/
+# config/init files
echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml
### SystemD based setup. ###
@@ -1080,6 +1083,11 @@
popd
+# Clean up some stuff we don't want to include
+rm -f %{buildroot}%{_libdir}/libmythqjson.prl \
+ %{buildroot}%{_libdir}/libmythzmq.la \
+ %{buildroot}%{_libdir}/pkgconfig/libmythzmq.pc
+
# MythPlugins
%if %{with_plugins}
pushd mythplugins
@@ -1225,6 +1233,7 @@
%{_bindir}/mythcommflag
%{_bindir}/mythmetadatalookup
%{_bindir}/mythutil
+%{_bindir}/mythlogserver
%{_bindir}/mythpreviewgen
%{_bindir}/mythtranscode
%{_bindir}/mythwikiscripts
@@ -1234,7 +1243,6 @@
%{_datadir}/mythtv/hardwareprofile/
%attr(-,mythtv,mythtv)
%dir %{_sysconfdir}/mythtv
-%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
%config(noreplace) %{_sysconfdir}/mythtv/config.xml
%files backend
@@ -1243,8 +1251,6 @@
%{_bindir}/mythjobqueue
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
-%{_bindir}/mythffmpeg
-%{_bindir}/mythffplay
%{_datadir}/mythtv/MXML_scpd.xml
%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
@@ -1287,6 +1293,7 @@
%dir %{_datadir}/mythtv/i18n
%dir %{_datadir}/mythtv/fonts
%{_datadir}/mythtv/fonts/*.ttf
+%{_datadir}/mythtv/fonts/*.otf
%{_datadir}/mythtv/fonts/*.txt
%{_datadir}/mythtv/i18n/mythfrontend_*.qm
%{_datadir}/applications/*mythfrontend.desktop
@@ -1308,6 +1315,9 @@
%dir %{_datadir}/mythtv/build
%{_datadir}/mythtv/build/settings.pro
+%files -n mythffmpeg
+%{_bindir}/mythffmpeg
+
%if %{with_perl}
%files -n perl-MythTV
%{perl_vendorlib}/MythTV.pm
@@ -1388,6 +1398,7 @@
%doc mythplugins/mythmusic/README
%{_libdir}/mythtv/plugins/libmythmusic.so
%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythmusic
+%{_datadir}/mythtv/mythmusic/
%{_datadir}/mythtv/musicmenu.xml
%{_datadir}/mythtv/music_settings.xml
%{_datadir}/mythtv/i18n/mythmusic_*.qm
@@ -1441,6 +1452,15 @@
%changelog
+* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
+- Update to latest upstream release.
+- Remove mysql.txt as it is no longer used.
+- Fix lib -> lib64 replacement command to be more accurate and support mythzmq
+- Add mythzmq stuff
+
+* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.25.2-3
+- Rebuilt for x264 ABI 125
+
* Sat Aug 25 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-2
- Update to latest fixes/0.25.
- Fix mythbackend looking in the wrong directory for config.xml (BZ#2450).
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-17/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 30 Jul 2012 18:22:57 -0000 1.55
+++ sources 29 Oct 2012 17:47:41 -0000 1.56
@@ -1 +1 @@
-05d3402459bf7380cf54cc6066c149a3 MythTV-mythtv-v0.25.2-0-g4e44650.tar.gz
+5a89c1afe1fdd7584786e7bd8bbf756a MythTV-mythtv-v0.26.0-0-g6c3ae81.tar.gz
--- mysql.txt DELETED ---
--- mythtv-0.25.1-hls_profile.patch DELETED ---
--- mythtv-0.25.1-php54.patch DELETED ---
--- mythtv-0.25.2-fixes.patch DELETED ---
12 years
- 1
- 0
rpms/mythtv/F-18 mythtv-0.26-fixes.patch, NONE, 1.1 ChangeLog, 1.3, 1.4 mythtv.spec, 1.105, 1.106 sources, 1.55, 1.56 mysql.txt, 1.1, NONE mythtv-0.25.1-hls_profile.patch, 1.1, NONE mythtv-0.25.1-php54.patch, 1.1, NONE mythtv-0.25.2-fixes.patch, 1.2, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19654
Modified Files:
ChangeLog mythtv.spec sources
Added Files:
mythtv-0.26-fixes.patch
Removed Files:
mysql.txt mythtv-0.25.1-hls_profile.patch
mythtv-0.25.1-php54.patch mythtv-0.25.2-fixes.patch
Log Message:
* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
- Update to latest upstream release.
- Remove mysql.txt as it is no longer used.
- Fix lib -> lib64 replacement command to be more accurate and support mythzmq
- Add mythzmq stuff
mythtv-0.26-fixes.patch:
README.rst | 1
mythplugins/mytharchive/i18n/mytharchive_es_es.qm |binary
mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45
mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4
mythplugins/mythgame/i18n/mythgame_es_es.ts | 4
mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68
mythplugins/mythmusic/i18n/mythmusic_it.qm |binary
mythplugins/mythmusic/i18n/mythmusic_it.ts | 3790 +++++++---
mythplugins/mythweather/i18n/mythweather_es_es.qm |binary
mythplugins/mythweather/i18n/mythweather_es_es.ts | 3
mythplugins/mythweather/i18n/mythweather_pl.qm |binary
mythplugins/mythweather/i18n/mythweather_pl.ts | 3
mythtv/bindings/python/MythTV/altdict.py | 2
mythtv/bindings/python/MythTV/dataheap.py | 58
mythtv/bindings/python/MythTV/system.py | 4
mythtv/contrib/imports/mirobridge/mirobridge.py | 96
mythtv/i18n/mythfrontend_es_es.qm |binary
mythtv/i18n/mythfrontend_es_es.ts | 2180 +++--
mythtv/i18n/mythfrontend_pl.qm |binary
mythtv/i18n/mythfrontend_pl.ts | 2733 +++----
mythtv/libs/libmyth/mythcontext.cpp | 2
mythtv/libs/libmythbase/signalhandling.cpp | 8
mythtv/libs/libmythtv/ThreadedFileWriter.cpp | 2
mythtv/libs/libmythtv/mythplayer.cpp | 4
mythtv/libs/libmythui/mythscreenstack.cpp | 2
mythtv/libs/libmythui/mythuiimage.cpp | 3
mythtv/libs/libmythui/mythuitype.cpp | 7
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10
mythtv/programs/mythavtest/main.cpp | 5
mythtv/programs/mythbackend/main.cpp | 5
mythtv/programs/mythbackend/main_helpers.cpp | 4
mythtv/programs/mythbackend/mainserver.cpp | 16
mythtv/programs/mythccextractor/main.cpp | 5
mythtv/programs/mythcommflag/main.cpp | 5
mythtv/programs/mythfilldatabase/main.cpp | 5
mythtv/programs/mythfrontend/guidegrid.cpp | 17
mythtv/programs/mythfrontend/main.cpp | 5
mythtv/programs/mythjobqueue/main.cpp | 5
mythtv/programs/mythlcdserver/main.cpp | 5
mythtv/programs/mythlogserver/main.cpp | 5
mythtv/programs/mythmediaserver/main.cpp | 5
mythtv/programs/mythmetadatalookup/main.cpp | 5
mythtv/programs/mythpreviewgen/main.cpp | 5
mythtv/programs/mythshutdown/main.cpp | 5
mythtv/programs/mythtranscode/main.cpp | 5
mythtv/programs/mythtv-setup/backendsettings.cpp | 6
mythtv/programs/mythtv-setup/main.cpp | 5
mythtv/programs/mythutil/main.cpp | 6
mythtv/programs/mythwelcome/main.cpp | 5
mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py | 20
mythtv/programs/scripts/metadata/Movie/tmdb3.py | 103
51 files changed, 5902 insertions(+), 3379 deletions(-)
--- NEW FILE mythtv-0.26-fixes.patch ---
README.rst | 1 +
mythplugins/mytharchive/i18n/mytharchive_es_es.qm | Bin 36188 -> 36136 bytes
mythplugins/mytharchive/i18n/mytharchive_es_es.ts | 45 +-
mythplugins/mythgallery/i18n/mythgallery_es_es.ts | 4 +-
mythplugins/mythgame/i18n/mythgame_es_es.ts | 4 +-
mythplugins/mythmusic/i18n/mythmusic_es_es.ts | 68 +-
mythplugins/mythmusic/i18n/mythmusic_it.qm | Bin 55341 -> 67158 bytes
mythplugins/mythmusic/i18n/mythmusic_it.ts | 3790 +++++++++++++++-----
mythplugins/mythweather/i18n/mythweather_es_es.qm | Bin 23630 -> 23631 bytes
mythplugins/mythweather/i18n/mythweather_es_es.ts | 3 +-
mythplugins/mythweather/i18n/mythweather_pl.qm | Bin 23846 -> 23847 bytes
mythplugins/mythweather/i18n/mythweather_pl.ts | 3 +-
mythtv/bindings/python/MythTV/altdict.py | 2 +-
mythtv/bindings/python/MythTV/dataheap.py | 58 +-
mythtv/bindings/python/MythTV/system.py | 4 +-
mythtv/contrib/imports/mirobridge/mirobridge.py | 96 +-
mythtv/i18n/mythfrontend_es_es.qm | Bin 669897 -> 672530 bytes
mythtv/i18n/mythfrontend_es_es.ts | 2180 ++++++------
mythtv/i18n/mythfrontend_pl.qm | Bin 350611 -> 354449 bytes
mythtv/i18n/mythfrontend_pl.ts | 2733 ++++++++-------
mythtv/libs/libmyth/mythcontext.cpp | 2 +-
mythtv/libs/libmythbase/signalhandling.cpp | 8 +-
mythtv/libs/libmythtv/ThreadedFileWriter.cpp | 2 +-
mythtv/libs/libmythtv/mythplayer.cpp | 4 +-
mythtv/libs/libmythui/mythscreenstack.cpp | 2 +-
mythtv/libs/libmythui/mythuiimage.cpp | 3 +-
mythtv/libs/libmythui/mythuitype.cpp | 7 +-
mythtv/libs/libmythui/mythuiwebbrowser.cpp | 10 +-
mythtv/programs/mythavtest/main.cpp | 5 +-
mythtv/programs/mythbackend/main.cpp | 5 +-
mythtv/programs/mythbackend/main_helpers.cpp | 4 +-
mythtv/programs/mythbackend/mainserver.cpp | 16 +-
mythtv/programs/mythccextractor/main.cpp | 5 +-
mythtv/programs/mythcommflag/main.cpp | 5 +-
mythtv/programs/mythfilldatabase/main.cpp | 5 +-
mythtv/programs/mythfrontend/guidegrid.cpp | 17 +-
mythtv/programs/mythfrontend/main.cpp | 5 +-
mythtv/programs/mythjobqueue/main.cpp | 5 +-
mythtv/programs/mythlcdserver/main.cpp | 5 +-
mythtv/programs/mythlogserver/main.cpp | 5 +-
mythtv/programs/mythmediaserver/main.cpp | 5 +-
mythtv/programs/mythmetadatalookup/main.cpp | 5 +-
mythtv/programs/mythpreviewgen/main.cpp | 5 +-
mythtv/programs/mythshutdown/main.cpp | 5 +-
mythtv/programs/mythtranscode/main.cpp | 5 +-
mythtv/programs/mythtv-setup/backendsettings.cpp | 6 +-
mythtv/programs/mythtv-setup/main.cpp | 5 +-
mythtv/programs/mythutil/main.cpp | 6 +-
mythtv/programs/mythwelcome/main.cpp | 5 +-
.../distros/mythtv_data/data_mythtv.py | 20 +-
mythtv/programs/scripts/metadata/Movie/tmdb3.py | 103 +-
51 files changed, 5902 insertions(+), 3379 deletions(-)
diff --git a/README.rst b/README.rst
index a151d89..576e0dc 100644
--- a/README.rst
+++ b/README.rst
@@ -20,3 +20,4 @@ Useful project links
- `Mailing lists <http://www.mythtv.org/mailman/listinfo>`_
- `IRC <irc://freenode.net/mythtv-users>`_ at Freenode.net, #mythtv-users
+
diff --git a/mythplugins/mytharchive/i18n/mytharchive_es_es.qm b/mythplugins/mytharchive/i18n/mytharchive_es_es.qm
index 362945a..9bc0687 100644
Binary files a/mythplugins/mytharchive/i18n/mytharchive_es_es.qm and b/mythplugins/mytharchive/i18n/mytharchive_es_es.qm differ
diff --git a/mythplugins/mytharchive/i18n/mytharchive_es_es.ts b/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
index 51f654c..9387d6d 100644
--- a/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
+++ b/mythplugins/mytharchive/i18n/mytharchive_es_es.ts
@@ -829,7 +829,7 @@ Por Favor, Espere...</translation>
<translation>el título va aquí</translation>
</message>
<message>
- <location filename="themestrings.h" line="94"/>
+ <location filename="themestrings.h" line="93"/>
<source>x.xx Gb</source>
<translation>x,xx Gb</translation>
</message>
@@ -1209,52 +1209,47 @@ Por Favor, Espere...</translation>
<translation>x,xx GB</translation>
</message>
<message>
- <location filename="themestrings.h" line="93"/>
- <source>Ok</source>
- <translation>Aceptar</translation>
- </message>
- <message>
- <location filename="themestrings.h" line="95"/>
+ <location filename="themestrings.h" line="94"/>
<source>Select Destination:</source>
<translation>Seleccionar Destino:</translation>
</message>
<message>
- <location filename="themestrings.h" line="96"/>
+ <location filename="themestrings.h" line="95"/>
<source>Parental level: %1</source>
<translation>Nivel parental: %1</translation>
</message>
<message>
- <location filename="themestrings.h" line="97"/>
+ <location filename="themestrings.h" line="96"/>
<source>Old size:</source>
<translation>Tamaño anterior:</translation>
</message>
<message>
- <location filename="themestrings.h" line="98"/>
+ <location filename="themestrings.h" line="97"/>
<source>New size:</source>
<translation>Tamaño nuevo:</translation>
</message>
<message>
- <location filename="themestrings.h" line="99"/>
+ <location filename="themestrings.h" line="98"/>
<source>Select a theme:</source>
<translation>Seleccione un tema:</translation>
</message>
<message>
- <location filename="themestrings.h" line="100"/>
+ <location filename="themestrings.h" line="99"/>
<source>Menu</source>
<translation>Menú</translation>
</message>
<message>
- <location filename="themestrings.h" line="101"/>
+ <location filename="themestrings.h" line="100"/>
<source>Chapter</source>
<translation>Capítulo</translation>
</message>
<message>
- <location filename="themestrings.h" line="102"/>
+ <location filename="themestrings.h" line="101"/>
<source>Detail</source>
<translation>Detalles</translation>
</message>
<message>
- <location filename="themestrings.h" line="103"/>
+ <location filename="themestrings.h" line="102"/>
<source>Select File to Import</source>
<translation>Seleccionar Archivo a Importar</translation>
</message>
@@ -1264,52 +1259,52 @@ Por Favor, Espere...</translation>
<translation>Añadir vídeo</translation>
</message>
<message>
- <location filename="themestrings.h" line="104"/>
+ <location filename="themestrings.h" line="103"/>
<source>Channel ID:</source>
<translation>ID de Canal:</translation>
</message>
<message>
- <location filename="themestrings.h" line="105"/>
+ <location filename="themestrings.h" line="104"/>
<source>Channel Number:</source>
<translation>Número de Canal:</translation>
</message>
<message>
- <location filename="themestrings.h" line="106"/>
+ <location filename="themestrings.h" line="105"/>
<source>Create DVD</source>
<translation>Crear DVD</translation>
</message>
<message>
- <location filename="themestrings.h" line="107"/>
+ <location filename="themestrings.h" line="106"/>
<source>Create Archive</source>
<translation>Crear Archivo</translation>
</message>
<message>
- <location filename="themestrings.h" line="108"/>
+ <location filename="themestrings.h" line="107"/>
<source>Encode Video File</source>
<translation>Codificar Archivo de Vídeo</translation>
</message>
<message>
- <location filename="themestrings.h" line="109"/>
+ <location filename="themestrings.h" line="108"/>
<source>Import Archive</source>
<translation>Importar Archivo</translation>
</message>
<message>
- <location filename="themestrings.h" line="110"/>
+ <location filename="themestrings.h" line="109"/>
<source>Archive Utilities</source>
<translation>Aplicaciones de Archivo</translation>
</message>
<message>
- <location filename="themestrings.h" line="111"/>
+ <location filename="themestrings.h" line="110"/>
<source>Show Log Viewer</source>
<translation>Mostrar Visor del Registro</translation>
</message>
<message>
- <location filename="themestrings.h" line="112"/>
+ <location filename="themestrings.h" line="111"/>
<source>Play Created DVD</source>
<translation>Reproducir el DVD Creado</translation>
</message>
<message>
- <location filename="themestrings.h" line="113"/>
[...20776 lines suppressed...]
diff --git a/mythtv/programs/scripts/metadata/Movie/tmdb3.py b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
index 6a133f5..853fbe4 100755
--- a/mythtv/programs/scripts/metadata/Movie/tmdb3.py
+++ b/mythtv/programs/scripts/metadata/Movie/tmdb3.py
@@ -11,19 +11,21 @@
#-----------------------
__title__ = "TheMovieDB.org V3"
__author__ = "Raymond Wagner"
-__version__ = "0.3.0"
+__version__ = "0.3.2"
# 0.1.0 Initial version
# 0.2.0 Add language support, move cache to home directory
# 0.3.0 Enable version detection to allow use in MythTV
-
-from MythTV.tmdb3 import searchMovie, Movie, Collection, set_key, set_cache, set_locale
-from MythTV import VideoMetadata
+# 0.3.1 Add --test parameter for proper compatibility with mythmetadatalookup
+# 0.3.2 Add --area parameter to allow country selection for release date and
+# parental ratings
from optparse import OptionParser
-from lxml import etree
import sys
-def buildSingle(inetref):
+def buildSingle(inetref, opts):
+ from MythTV.tmdb3 import Movie
+ from MythTV import VideoMetadata
+ from lxml import etree
movie = Movie(inetref)
tree = etree.XML(u'<metadata></metadata>')
mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
@@ -35,12 +37,30 @@ def buildSingle(inetref):
for i,j in mapping:
if getattr(movie, j):
setattr(m, i, getattr(movie, j))
+
+ releases = movie.releases.items()
+
+ if opts.country:
+ for alt in movie.alternate_titles:
+ if alt.country == opts.country:
+ m.title = alt.title
+ break
+ try:
+ # resort releases with selected country at top to ensure it
+ # is selected by the metadata libraries
+ index = zip(*releases)[0].index(opts.country)
+ releases.insert(0, releases.pop(index))
+ except ValueError:
+ pass
+ else:
+ m.releasedate = releases[0][1].releasedate
+
m.inetref = str(movie.id)
- if movie.releasedate:
- m.year = movie.releasedate.year
if movie.collection:
m.collectionref = str(movie.collection.id)
- for country, release in movie.releases.items():
+ if movie.releasedate:
+ m.year = movie.releasedate.year
+ for country, release in releases:
if release.certification:
m.certifications[country] = release.certification
for genre in movie.genres:
@@ -70,11 +90,15 @@ def buildSingle(inetref):
xml_declaration=True))
sys.exit()
-def buildList(query):
+def buildList(query, opts):
# TEMPORARY FIX:
# replace all dashes from queries to work around search behavior
# as negative to all text that comes afterwards
query = query.replace('-',' ')
+
+ from MythTV.tmdb3 import searchMovie
+ from MythTV import VideoMetadata
+ from lxml import etree
results = searchMovie(query)
tree = etree.XML(u'<metadata></metadata>')
mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
@@ -89,6 +113,10 @@ def buildList(query):
if getattr(res, j):
setattr(m, i, getattr(res, j))
m.inetref = str(res.id)
+ #TODO:
+ # should releasedate and year be pulled from the country-specific data
+ # or should it be left to the default information to cut down on
+ # traffic from searches
if res.releasedate:
m.year = res.releasedate.year
if res.backdrop:
@@ -109,7 +137,10 @@ def buildList(query):
xml_declaration=True))
sys.exit(0)
-def buildCollection(inetref):
+def buildCollection(inetref, opts):
+ from MythTV.tmdb3 import Collection
+ from MythTV import VideoMetadata
+ from lxml import etree
collection = Collection(inetref)
tree = etree.XML(u'<metadata></metadata>')
m = VideoMetadata()
@@ -129,6 +160,7 @@ def buildCollection(inetref):
sys.exit()
def buildVersion():
+ from lxml import etree
version = etree.XML(u'<grabber></grabber>')
etree.SubElement(version, "name").text = __title__
etree.SubElement(version, "author").text = __author__
@@ -142,43 +174,78 @@ def buildVersion():
xml_declaration=True))
sys.exit(0)
-def main():
- set_key('c27cb71cff5bd76e1a7a009380562c62')
- set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
+def performSelfTest():
+ err = 0
+ try:
+ import MythTV
+ except:
+ err = 1
+ print ("Failed to import MythTV bindings. Check your `configure` output "
+ "to make sure installation was not disabled due to external "
+ "dependencies")
+ try:
+ import MythTV.tmdb3
+ except:
+ err = 1
+ print ("Failed to import PyTMDB3 library. This should have been included "
+ "with the python MythTV bindings.")
+ try:
+ import lxml
+ except:
+ err = 1
+ print "Failed to import python lxml library."
+
+ if not err:
+ print "Everything appears in order."
+ sys.exit(err)
+def main():
parser = OptionParser()
parser.add_option('-v', "--version", action="store_true", default=False,
dest="version", help="Display version and author")
+ parser.add_option('-t', "--test", action="store_true", default=False,
+ dest="test", help="Perform self-test for dependencies.")
parser.add_option('-M', "--movielist", action="store_true", default=False,
dest="movielist", help="Get Movies matching search.")
parser.add_option('-D', "--moviedata", action="store_true", default=False,
dest="moviedata", help="Get Movie data.")
parser.add_option('-C', "--collection", action="store_true", default=False,
dest="collectiondata", help="Get Collection data.")
- parser.add_option( "-l", "--language", metavar="LANGUAGE", default=u'en',
+ parser.add_option('-l', "--language", metavar="LANGUAGE", default=u'en',
dest="language", help="Specify language for filtering.")
+ parser.add_option('-a', "--area", metavar="COUNTRY", default=None,
+ dest="country", help="Specify country for custom data.")
opts, args = parser.parse_args()
if opts.version:
buildVersion()
+ if opts.test:
+ performSelfTest()
+
+ from MythTV.tmdb3 import set_key, set_cache, set_locale
+ set_key('c27cb71cff5bd76e1a7a009380562c62')
+ set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
+
if opts.language:
set_locale(language=opts.language, fallthrough=True)
+ if opts.country:
+ set_locale(country=opts.country, fallthrough=True)
if (len(args) != 1) or (args[0] == ''):
sys.stdout.write('ERROR: tmdb3.py requires exactly one non-empty argument')
sys.exit(1)
if opts.movielist:
- buildList(args[0])
+ buildList(args[0], opts)
if opts.moviedata:
- buildSingle(args[0])
+ buildSingle(args[0], opts)
if opts.collectiondata:
- buildCollection(args[0])
+ buildCollection(args[0], opts)
if __name__ == '__main__':
main()
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-18/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 28 Aug 2012 18:14:44 -0000 1.3
+++ ChangeLog 29 Oct 2012 15:38:21 -0000 1.4
@@ -1,129 +1,275 @@
-commit 46cab93562429cd19029402a2387f63a72aeb898
-Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Tue Jul 31 14:21:22 2012 -0400
+commit e3087dda66175a6b7308ad5a5e80a35ff7d72fd3
+Author: Jonatan Lindblad <jlindblad(a)mythtv.org>
+Date: Sun Oct 28 21:59:38 2012 +0100
- Correct --printexpire option in mythbackend.
+ Internet Content: Remove deprecated YouTube categories
- This corrects logic that was accidentally inverted in 8bc8dd54, and
- allows `mythbackend --printexpire` to be used again.
- (cherry picked from commit a9f18c63bfb23494ee83a8ba76d82fc320617067)
+ Fixes #11193
+ (cherry picked from commit 7c903d2a90d7962fa6e1ee856d506539ce17c1c8)
+
+commit 0de21aa876e3117ff98499c5a502affc52b5277e
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Oct 25 15:16:38 2012 -0400
+
+ Tweak DictData behavior to properly function with Properties.
+ (cherry picked from commit 662b5e83cfa103fc3aed86c194b2fa2c6b9424d8)
-commit 8ab229a8bed860fb0855797c683655a7465e2ee4
-Merge: a4cdc9e 1c496c8
+commit 5e0099555dac1c16f7a76f46996675fa99c7a6b7
Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Tue Jul 31 14:22:32 2012 -0400
+Date: Thu Oct 25 15:14:27 2012 -0400
+
+ Correct handling of Artwork when database field is set to NULL.
+ (cherry picked from commit 4646e7f56fc97f62d05d42b5896e8eceb361492e)
+
+commit 744a595db2273affca4030f4e8879860d72d4683
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Oct 23 15:51:05 2012 -0400
+
+ Use 'unicode' rather than 'str' for UTF8 compatibility.
+ (cherry picked from commit 0bc83db48ec08b8df576c6ecbf1049567d34ab7a)
- Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+commit 35389d8f177c94a7b6381b5a63cfcb997d22dc66
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Tue Oct 23 15:42:31 2012 -0400
-commit 1c496c81662eabda444452071eb18f2fd375d4d0
-Author: Kyle <klillis(a)gmail.com>
-Date: Mon Jul 30 13:34:11 2012 -0400
+ Fix immutable methods in Artwork class.
+
+ This fixes an issue with several immutable methods in the Artwork class,
+ inherited from the parent UserString class. As the Artwork class is
+ modified for use as a property, and not intended to be called directly
+ for storage of a string, the inherited UserString methods that returned
+ a new instance using the __class__ attribute would fail. This adds a
+ __new__ method that detects such uses and forces the call to return a
+ standard str type instead.
+ (cherry picked from commit 9f66fa0f9a4d9d759b9fdb44f411a4dc1a0748cb)
+
+commit 163e0e629095401268cf67309d16987ded6a0d72
+Author: Bill <billstuff2001(a)sbcglobal.net>
+Date: Fri Oct 12 13:47:27 2012 -0400
- Fixes #10897. Clear paused when we unpause FirewireRecorder.
+ Fixes #11061. Speed up TFW recovery after falling behind on writes.
Signed-off-by: Daniel Thor Kristjansson <danielk(a)cuymedia.net>
-commit 9c199a42258f2a19dd1c8d3b934e6eb04f1757ce
-Author: Daniel Thor Kristjansson <dkristjansson(a)mythtv.org>
-Date: Tue Jul 24 12:13:16 2012 -0400
+commit 143e2de7da6c88d8c9f736e700df2e71130f0882
+Author: Jonatan Lindblad <jlindblad(a)mythtv.org>
+Date: Sun Oct 21 17:30:38 2012 +0200
+
+ MythUI: Fix double rendering of fading screens
+ (cherry picked from commit da065e42b2cfa3ea875df1b5c36ce34422f379a0)
+
+commit 2870590667b4b3b3e13b171c5e81a805d30512ce
+Author: Jonatan Lindblad <jlindblad(a)mythtv.org>
+Date: Sun Oct 21 13:29:12 2012 +0200
- Fixes #10870. Fix Start/Stop race condition in StreamHandler.
+ MythUI: Fix potential use after free when leaving a web page
- This is a backport of [445faaa47].
+ It's not safe to delete a QNetworkAccessManager before the QWebPage it is being
+ used with since any outstanding QNetworkReplys will be deleted, causing
+ QWebPage to potentially access free memory.
+
+ Fixes #11168.
+ (cherry picked from commit 83e88bc0abe21f54daace479ac921c352710c9de)
-commit a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
-Author: Stuart Morgan <smorgan(a)mythtv.org>
-Date: Sun Jul 29 12:42:41 2012 +0100
+commit 8b7f6ce5cb97702718d69bea8e582f5dc26746c9
+Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+Date: Fri Oct 19 20:47:32 2012 +1100
+
+ Fix OS X compilation
+
+ Signal SIGRTMIN doesn't exist under OS X so make all this code conditional.
+
+ [cherry-picked from 9f65a657827790687b8ac24daf7a4c581e7535a3]
- Restore setup pincode following [57adc5d120] - 'Flatten the Setup Menus in the default menu theme' which dropped util_menu.xml but failed to carry over the <password> markup.
- (cherry picked from commit 134417fe3bf7170f3419d2388a6c26afe16c4927)
+commit fdfd45035d322bba1c537546dcf0c392dc1b35d5
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Oct 19 12:12:51 2012 -0400
-commit 3256849b14cc882536a153e7fbe4724adf03260c
-Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
-Date: Tue Jul 24 10:56:15 2012 -0700
+ Add -a parameter to tmdb3.py.
+ (cherry picked from commit 150e57259794084ae6d819ff72cb9977b7cf20bf)
- Subtitles: backport some code to enable cc608 TT deprecation log message.
+commit bfc3dfc12d67104f37adafc9d5ad148a13db83c1
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Fri Oct 19 02:40:57 2012 -0400
-commit 39fad46248bbcbe5ab27068e73fb7c5a91bc155b
-Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
-Date: Tue Jul 24 08:23:53 2012 -0700
+ Add -t parameter to tmdb3.py.
+ (cherry picked from commit 144c4f5142ad783b5fce7814716816576ee232a7)
+
+commit 474107b04853831df6e7a0a3ca869a64097602bb
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Thu Oct 18 15:20:35 2012 -0400
- Subtitles: Put a "DEPRECATED_608_TELETEXT" message into the logs.
+ Fix setting of values to Artwork property.
- Support for CEA-608 teletext captions is to be removed. Allow users
- to check whether they would be affected. Refs #10786.
- (cherry picked from commit 7b1aef85ec92658acb91c1ff019aed909e5df30a)
+ This makes the Artwork property derived from a MutableString rather than
+ a unicode type, allowing the setting of values to work properly, rather
+ than merely by chance, and correcting an issue where importMetadata
+ would not apply a coverart value to Video Library entries.
+ (cherry picked from commit e4b46f0cdc1a18ee5dca94e29229531d928a6dc1)
-commit 9e0d839be7667056dc65b79711dda84159a1b13d
-Author: Stuart Morgan <smorgan(a)mythtv.org>
-Date: Tue Jul 24 14:11:47 2012 +0100
+commit bff8eb1a1893335f6b96eb6eb8ebd1d567feb9cb
+Author: Antonio Marcos Lopez Alonso <amlopezalonso(a)gmail.com>
+Date: Tue Oct 16 06:50:16 2012 -0400
+
+ Updated Spanish/Spain MythFrontend, MythArchive and MythWeather
+ translation from Antonio Marcos Lopez Alonso.
+
+ Backport of af9d36763 to 0.26-fixes
+
+ Thank you Antonio!
+
+ Closes #11179
+
+ Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
- Set m_cdWatcher to NULL after deletion, fixes segfault on exiting frontend. Fixes #10936
- (cherry picked from commit de851dd273eaa80689a427f915c7db40d015e0ba)
+commit fd6e25bfe3074507a5f27133dddf34ccd7dbb988
+Author: Nicolas Riendeau <nriendeau(a)mythtv.org>
+Date: Mon Oct 15 19:31:32 2012 -0400
-commit 10a68895e1fcd5c409058d2eb61fe59e78736235
-Author: Stuart Morgan <smorgan(a)mythtv.org>
-Date: Sun Jul 22 23:24:40 2012 +0100
+ Updated Polish Mythfrontend and MythWeather translation
+ from Warpme
+
+ Thank you Warpme and porbas!
+
+ Refs #11178
+
+commit 280e7efd82fe2daccee8d5fa542e4610af36124a
+Author: Jim Stichnoth <jstichnoth(a)mythtv.org>
+Date: Sat Oct 13 16:30:23 2012 -0700
- Fix segfault after music scan completes.
- (cherry picked from commit b2379ae9b8d42c23c3feee26b52a1f0a2ebef394)
+ Fixes #11151 by correcting a float-to-integer truncation problem.
+ (cherry picked from commit 4a09ca11c47137a88355a961efd5131c2157d4d7)
-commit ed58b3a818a1796340ba0f085a53159eb1d52266
-Author: Stuart Morgan <smorgan(a)mythtv.org>
-Date: Sat Jul 21 23:53:41 2012 +0100
+commit aae34c428d30413b6f62aa2279a9189e399ed430
+Author: Morris Cavestro <morriscavestro(a)yahoo.it>
+Date: Mon Oct 8 13:51:39 2012 -0400
- Fix for Synaesthesia memory corruption
+ Updated Italian MythMusic translation
+ from Morris Cavestro
- We were allocating just half the required space and consequently
- writing beyond the end of the array. This consistently caused
- segfaults for me when using the Synaesthesia visualiser.
+ (Backport to 0.26-fixes)
- This fix appears to be consistent with the code used in other projects
- which were also derived from the original Synaesthia project.
+ Thank you Morris!
- e.g. GStreamer/Source/gst-plugins-ugly/gst/synaesthesia/synaescope.c
- (cherry picked from commit e331017f2d1ee9be82da9c0b64ca4435ec3efd1e)
+ Closes #11167
+
+ Signed-off-by: Nicolas Riendeau <nriendeau(a)mythtv.org>
-commit a4cdc9e01295991056cdc8c5411e70937b1a4842
-Merge: 450ed91 f0e2ad8
+commit 90ba02c17dd993792f29fb4ac5d2d71fce9670b3
+Merge: ff922bb 624ad5a
Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Fri Jul 20 21:06:48 2012 -0400
+Date: Wed Oct 10 11:01:53 2012 -0400
- Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
+ Merge branch 'fixes/0.26' of code.mythtv.org:mythtv into fixes/0.26
-commit f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63
-Author: Jean-Yves Avenard <jyavenard(a)mythtv.org>
-Date: Wed Jul 18 20:49:11 2012 +1000
+commit ff922bb074b425d086324b7d89db348f90d623dd
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Wed Oct 10 10:52:24 2012 -0400
- Make AllowLinkLocal default to true
+ Add reporting of logging volume to Smolt.
- Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+ This reports the logging volume as a percentage of the total amount
+ stored in the database, for each urgency level. This is intended as a
+ simple metric to determine stability of MythTV, as higher counts of
+ higher urgency levels will indicate an increase in problems seen by the
+ user base.
+ (cherry picked from commit 5f90b1d62c4d692a6c23ae22ab2047db85e6572e)
-commit 4b82e27e6c89bac9d60c3a56f1d924979c80c746
-Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Wed Jul 18 01:50:46 2012 -0400
+commit 624ad5a3533ba34033debb37f0058da0670cf4e1
+Author: Jesse Crews <jcrews(a)gridlox.net>
+Date: Tue Oct 9 10:59:27 2012 +0100
+
+ Fix mythbackend not exiting after network initialization failure. Fixes #11163
+
+ Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org>
+
+commit 2d2932ac11ed6d01f05f502a8e373455774ba46a
+Author: Lawrence Rust <lvr(a)softsystem.co.uk>
+Date: Sun May 6 12:33:35 2012 +0200
+
+ libmythui: Fix a redraw bug in MythUIType
+
+ While evaluating the ATI Catalyst 'TearFree Desktop' option I noticed
+ that sometimes a keypress was apparently being held up until the time
+ on the main menu was updated. Initially I thought that this was a lirc
+ or fglrx issue, but on investigation it turned out that MythMainWindow::animate
+ was requesting updates for empty repaint regions. Delving further
+ showed that MythUIType::Draw was resetting m_DirtyRegion to empty
+ even if the clipRect was smaller, thus leaving unpainted regions.
+
+ m_DirtyRegion may be extended by HandleMovementPulse, SetRedraw
+ or SetChildNeedsRedraw etc AFTER GetDirtyArea is called.
+ So when MythUIType::Draw is called, clipRect may not include the whole
+ of m_DirtyRegion.
+
+ This patch subtracts the Draw clipRect from m_DirtyRegion instead of
+ simply emtying it.
+
+ Fixes #10695
+
+ Signed-off-by: Lawrence Rust <lvr(a)softsystem.co.uk>
+ Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org>
+ (cherry picked from commit 39984eb579369f6cb25cd8f57acb8b23ebcccfc6)
+
+commit 52c48f983ca3175be983bdaa8c0072b736315d3c
+Author: Xavier Hervy <xavier.hervy(a)gmail.com>
+Date: Sun Oct 7 19:19:54 2012 +0100
- Correct bad copy/paste in ServerPool.
+ Allow adding a channel to an empty channel group from the guide. Update the cached channel group list after adding or removing a channel. Fixes #10411
- Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+ Signed-off-by: Stuart Morgan <smorgan(a)mythtv.org>
+ (cherry picked from commit 9d5aabc1ed42156bf23a9d0afac0b31fdaedc5e1)
-commit e4ba7d74aee6bd437e747772046a8836fa9ae5cb
+commit 4c67cedbea9e4b18d7688f30af02bd46e65cd07d
Author: Raymond Wagner <rwagner(a)mythtv.org>
-Date: Sat Jul 14 01:57:46 2012 -0400
+Date: Sat Oct 6 13:42:21 2012 -0400
- Rework IP selection so link-local is always used.
+ Read in dbPingHost value from config.xml.
- This adds an option to mythtv-setup that makes link-local addresses
- listened to by default. This behavior can still be disabled, to block
- off network access.
+ Fixes #11148
+ (cherry picked from commit 65a720c9b830ab77bbd2931e03fb428e05dee6f9)
+
+commit ad5bb8b0929d546ac91324ccee5e7f7f2a49742e
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sat Oct 6 12:40:36 2012 +0100
+
+ Only set the BackendServerIP6 setting to ::1 by default if that address is available, otherwise leave it blank
+
+commit 6b541e74da22ff4daa28dd13425bcc9ffe2c7303
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Sat Oct 6 11:36:59 2012 +0100
+
+ Log an error if we are unable to find IPv4 or IPv6 addresses, only
+ exit if we are unable to find any address to bind to
+
+commit dd0521ec029f5e5413592e93b3beff946fb5499f
+Author: Raymond Wagner <rwagner(a)mythtv.org>
+Date: Sat Oct 6 04:28:48 2012 -0400
+
+ Fix single episode grabber for season 0 specials.
- Signed-off-by: Jean-Yves Avenard <jyavenard(a)mythtv.org>
+ This makes the check for arguments to grabInetref() look specifically
+ for None, rather than boolean False, to prevent false positives when
+ dealing with specials that have a season of 0.
+ (cherry picked from commit 7da754ad0d350988f324c239477a6587bf88ba1c)
-commit 450ed915d3a13b84489ecdebdad6fca18fc8c312
-Author: GDragon <gdragon(a)jetcom.org>
-Date: Mon Jul 9 15:33:31 2012 -0400
+commit c744347675573dfc690cb263353b3ccc4a950a1a
+Author: R.D. Vaughan <r.d.vaughan(a)rogers.com>
+Date: Tue Oct 2 13:29:55 2012 -0400
- Properly set job type in fromProgram and fromRecorded methods.
+ Adjust to datetime issues with MythTV v0.26's move to UTC datetimes in DB
Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
- (cherry picked from commit 868a566c1d635be3e60f83438f87b6f21d9f1780)
+ (cherry picked from commit fcf6da5608cc5621a7bee48120d988352f34189f)
+
+commit a49c750cfc1a2d3f0b8a46f98e75a0e79b3a79fc
+Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
+Date: Tue Oct 2 13:53:03 2012 -0700
+
+ Force a commit to fixes/0.26 to test the tagging
+
+commit b4deb185994d6388b55cea18aa3e861c71541101
+Author: Stuart Morgan <smorgan(a)mythtv.org>
+Date: Tue Oct 2 12:05:20 2012 +0100
+
+ Prevent a segfault in MythUIImage, this doesn't fix the root cause of the problem but at least we won't crash. Refs #11047
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-18/mythtv.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- mythtv.spec 9 Sep 2012 16:30:16 -0000 1.105
+++ mythtv.spec 29 Oct 2012 15:38:22 -0000 1.106
@@ -1,4 +1,3 @@
-#
# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
#
# by: Chris Petersen <rpm(a)forevermore.net>
@@ -60,12 +59,12 @@
# Git revision and branch ID
# 0.25 release: git tag v0.25.1
-%define _gitrev v0.25.2-15-g46cab93
-%define branch fixes/0.25
+%define _gitrev v0.26.0-28-ge3087dd
+%define branch fixes/0.26
# Mythtv and plugins from github.com
-%global githash1 g4e44650
-%global githash2 19087cb
+%global githash1 g6c3ae81
+%global githash2 d2f9798
#
# Basic descriptive tags for this package:
@@ -76,12 +75,11 @@
Group: Applications/Multimedia
# Version/Release info
-Version: 0.25.2
+Version: 0.26.0
%if "%{branch}" == "master"
-Release: 0.2.git.%{_gitrev}%{?dist}
-#Release: 0.1.rc1%{?dist}
+Release: 0.1.git.%{_gitrev}%{?dist}
%else
-Release: 3%{?dist}
+Release: 1%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -131,15 +129,10 @@
################################################################################
-# https://github.com/MythTV/mythtv/tarball/v0.25
+# https://github.com/MythTV/mythtv/tarball/v0.26
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
-Patch0: mythtv-0.25.2-fixes.patch
-
-# Fixes for PHP 5.4
-Patch1: mythtv-0.25.1-php54.patch
-# Adapative HLS profile based on resolution.
-Patch2: mythtv-0.25.1-hls_profile.patch
+Patch0: mythtv-0.26-fixes.patch
Source10: PACKAGE-LICENSING
Source11: ChangeLog
@@ -152,7 +145,6 @@
Source107: mythfrontend.desktop
Source108: mythtv-setup.png
Source109: mythtv-setup.desktop
-Source110: mysql.txt
Source111: 99-mythbackend.rules
@@ -181,6 +173,7 @@
BuildRequires: qt-webkit-devel
BuildRequires: qt-devel >= 4.6
BuildRequires: phonon-devel
+BuildRequires: libuuid-devel
BuildRequires: lm_sensors-devel
BuildRequires: lirc-devel
@@ -349,7 +342,8 @@
Requires: php-MythTV = %{version}-%{release}
Requires: python-MythTV = %{version}-%{release}
Requires: mythplugins = %{version}-%{release}
-Requires: mythweb
+Requires: mythweb = %{version}
+Requires: mythffmpeg = %{version}-%{release}
Requires: mysql-server >= 5, mysql >= 5
Requires: xmltv
@@ -578,6 +572,19 @@
This package contains components needed by multiple other MythTV components.
################################################################################
+################################################################################
+
+%package -n mythffmpeg
+Summary: MythTV build of FFmpeg
+Group: Applications/Multimedia
+
+%description -n mythffmpeg
+Several MythTV utilities interact with FFmpeg, which changes its parameters
+often enough to make it a hassle to support the variety of versions used by
+MythTV users. This is a snapshot of the FFmpeg code so that MythTV utilities
+can interact with a known verion.
+
+################################################################################
%if %{with_perl}
@@ -805,14 +812,10 @@
# Replace static lib paths with %{_lib} so we build properly on x86_64
# systems, where the libs are actually in lib64.
if [ "%{_lib}" != "lib" ]; then
- grep -rlZ '/lib/' . | xargs -r0 sed -i -e 's,/lib/,/%{_lib}/,g'
- grep -rlZ '/lib$' . | xargs -r0 sed -i -e 's,/lib$,/%{_lib},'
- grep -rlZ '/lib ' . | xargs -r0 sed -i -e 's,/lib ,/%{_lib} ,g'
+ find \( -name 'configure' -o -name '*pro' -o -name 'Makefile' \) -exec sed -r -i -e 's,/lib\b,/%{_lib},g' {} \+
fi
%patch0 -p1 -b .mythtv
-%patch1 -p1 -b .php54
-%patch2 -p1 -b .hls_profile
# Install ChangeLog
install -m 0644 %{SOURCE11} .
@@ -948,6 +951,7 @@
-exec sed -i -e "s,DEPLIBS = \$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \
-exec sed -i -e "s,\$\${PREFIX}/include/mythtv,$temp%{_includedir}/mythtv," {} \;
echo "INCLUDEPATH -= \$\${PREFIX}/include" >> settings.pro
+ echo "INCLUDEPATH -= \$\${SYSROOT}/\$\${PREFIX}/include" >> settings.pro
echo "INCLUDEPATH -= %{_includedir}" >> settings.pro
echo "INCLUDEPATH += $temp%{_includedir}" >> settings.pro
echo "INCLUDEPATH += %{_includedir}" >> settings.pro
@@ -1040,8 +1044,7 @@
# Fix permissions on executable python bindings
# chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth*.py
-# mysql.txt and other config/init files
- install -m 0644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/
+# config/init files
echo "# to be filled in by mythtv-setup" > %{buildroot}%{_sysconfdir}/mythtv/config.xml
### SystemD based setup. ###
@@ -1080,6 +1083,11 @@
popd
+# Clean up some stuff we don't want to include
+rm -f %{buildroot}%{_libdir}/libmythqjson.prl \
+ %{buildroot}%{_libdir}/libmythzmq.la \
+ %{buildroot}%{_libdir}/pkgconfig/libmythzmq.pc
+
# MythPlugins
%if %{with_plugins}
pushd mythplugins
@@ -1225,6 +1233,7 @@
%{_bindir}/mythcommflag
%{_bindir}/mythmetadatalookup
%{_bindir}/mythutil
+%{_bindir}/mythlogserver
%{_bindir}/mythpreviewgen
%{_bindir}/mythtranscode
%{_bindir}/mythwikiscripts
@@ -1234,7 +1243,6 @@
%{_datadir}/mythtv/hardwareprofile/
%attr(-,mythtv,mythtv)
%dir %{_sysconfdir}/mythtv
-%config(noreplace) %{_sysconfdir}/mythtv/mysql.txt
%config(noreplace) %{_sysconfdir}/mythtv/config.xml
%files backend
@@ -1243,8 +1251,6 @@
%{_bindir}/mythjobqueue
%{_bindir}/mythmediaserver
%{_bindir}/mythreplex
-%{_bindir}/mythffmpeg
-%{_bindir}/mythffplay
%{_datadir}/mythtv/MXML_scpd.xml
%{_datadir}/mythtv/backend-config/
%attr(-,mythtv,mythtv) %dir %{_localstatedir}/lib/mythtv
@@ -1287,6 +1293,7 @@
%dir %{_datadir}/mythtv/i18n
%dir %{_datadir}/mythtv/fonts
%{_datadir}/mythtv/fonts/*.ttf
+%{_datadir}/mythtv/fonts/*.otf
%{_datadir}/mythtv/fonts/*.txt
%{_datadir}/mythtv/i18n/mythfrontend_*.qm
%{_datadir}/applications/*mythfrontend.desktop
@@ -1308,6 +1315,9 @@
%dir %{_datadir}/mythtv/build
%{_datadir}/mythtv/build/settings.pro
+%files -n mythffmpeg
+%{_bindir}/mythffmpeg
+
%if %{with_perl}
%files -n perl-MythTV
%{perl_vendorlib}/MythTV.pm
@@ -1388,6 +1398,7 @@
%doc mythplugins/mythmusic/README
%{_libdir}/mythtv/plugins/libmythmusic.so
%attr(0775,mythtv,mythtv) %{_localstatedir}/lib/mythmusic
+%{_datadir}/mythtv/mythmusic/
%{_datadir}/mythtv/musicmenu.xml
%{_datadir}/mythtv/music_settings.xml
%{_datadir}/mythtv/i18n/mythmusic_*.qm
@@ -1441,6 +1452,12 @@
%changelog
+* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
+- Update to latest upstream release.
+- Remove mysql.txt as it is no longer used.
+- Fix lib -> lib64 replacement command to be more accurate and support mythzmq
+- Add mythzmq stuff
+
* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.25.2-3
- Rebuilt for x264 ABI 125
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-18/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 22 Jul 2012 18:42:46 -0000 1.55
+++ sources 29 Oct 2012 15:38:22 -0000 1.56
@@ -1 +1 @@
-05d3402459bf7380cf54cc6066c149a3 MythTV-mythtv-v0.25.2-0-g4e44650.tar.gz
+5a89c1afe1fdd7584786e7bd8bbf756a MythTV-mythtv-v0.26.0-0-g6c3ae81.tar.gz
--- mysql.txt DELETED ---
--- mythtv-0.25.1-hls_profile.patch DELETED ---
--- mythtv-0.25.1-php54.patch DELETED ---
--- mythtv-0.25.2-fixes.patch DELETED ---
12 years
- 1
- 0
rpms/mythtv/devel mythtv.spec,1.108,1.109
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13899
Modified Files:
mythtv.spec
Log Message:
Minor spec tweaks.
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mythtv.spec 29 Oct 2012 02:04:24 -0000 1.108
+++ mythtv.spec 29 Oct 2012 13:24:04 -0000 1.109
@@ -32,7 +32,7 @@
# The following options are enabled by default. Use these options to disable:
#
# --without vdpau Disable VDPAU support
-# --without crystalhd Disable Crystal HD support (disabled, currently broken)
+# --without crystalhd Disable Crystal HD support
# --without perl Disable building of the perl bindings
# --without python Disable building of the python bindings
#
@@ -59,7 +59,7 @@
# Git revision and branch ID
# 0.25 release: git tag v0.25.1
-%define _gitrev v0.26.0-0-g6c3ae8
+%define _gitrev v0.26.0-28-ge3087dd
%define branch fixes/0.26
# Mythtv and plugins from github.com
@@ -129,7 +129,7 @@
################################################################################
-# https://github.com/MythTV/mythtv/tarball/v0.25
+# https://github.com/MythTV/mythtv/tarball/v0.26
Source0: MythTV-%{name}-v%{version}-0-%{githash1}.tar.gz
Patch0: mythtv-0.26-fixes.patch
12 years
- 1
- 0