January 2014 - rpmfusion-commits

rpms/buildsys-build-rpmfusion/F-20 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.30, 1.31 buildsys-build-rpmfusion.spec, 1.50, 1.51

by Nicolas Chauvet

Author: kwizart Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32392 Modified Files: buildsys-build-rpmfusion-kerneldevpkgs-current buildsys-build-rpmfusion.spec Log Message: * Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 10:20-4 - rebuild for kernel 3.12.7-300.fc20 Index: buildsys-build-rpmfusion-kerneldevpkgs-current =================================================================== RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-20/buildsys-build-rpmfusion-kerneldevpkgs-current,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- buildsys-build-rpmfusion-kerneldevpkgs-current 24 Dec 2013 09:39:01 -0000 1.30 +++ buildsys-build-rpmfusion-kerneldevpkgs-current 12 Jan 2014 15:03:22 -0000 1.31 @@ -1,4 +1,4 @@ -3.12.6-300.fc20 -3.12.6-300.fc20smp -3.12.6-300.fc20PAE -3.12.6-300.fc20lpae +3.12.7-300.fc20 +3.12.7-300.fc20smp +3.12.7-300.fc20PAE +3.12.7-300.fc20lpae Index: buildsys-build-rpmfusion.spec =================================================================== RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-20/buildsys-build-rpmfusion.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- buildsys-build-rpmfusion.spec 24 Dec 2013 09:39:01 -0000 1.50 +++ buildsys-build-rpmfusion.spec 12 Jan 2014 15:03:22 -0000 1.51 @@ -3,7 +3,7 @@ Name: buildsys-build-%{repo} Epoch: 10 Version: 20 -Release: 3 +Release: 4 Summary: Tools and files used by the %{repo} buildsys Group: Development/Tools @@ -86,6 +86,9 @@ %changelog +* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 10:20-4 +- rebuild for kernel 3.12.7-300.fc20 + * Tue Dec 24 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 10:20-3 - rebuild for kernel 3.12.6-300.fc20

10 years, 4 months

1
0
0 / 0

rpms/nvidia-173xx-kmod/devel nvidia_3.13_kernel.patch, NONE, 1.1 nvidia-173xx-kmod.spec, 1.53, 1.54

by Leigh Scott

Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4686 Modified Files: nvidia-173xx-kmod.spec Added Files: nvidia_3.13_kernel.patch Log Message: * Sun Jan 12 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.39-2 - patch for 3.13 kernel nvidia_3.13_kernel.patch: nvacpi.c | 3 +++ 1 file changed, 3 insertions(+) --- NEW FILE nvidia_3.13_kernel.patch --- --- a/usr/src/nv/nvacpi.c +++ b/usr/src/nv/nvacpi.c @@ -259,7 +259,10 @@ static int nv_acpi_remove(struct acpi_de if (pNvAcpiObject->notify_handler_installed) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) + /* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */ NV_ACPI_OS_WAIT_EVENTS_COMPLETE(); +#endif // remove event notifier status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event); Index: nvidia-173xx-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/devel/nvidia-173xx-kmod.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- nvidia-173xx-kmod.spec 19 Dec 2013 14:58:01 -0000 1.53 +++ nvidia-173xx-kmod.spec 12 Jan 2014 12:30:07 -0000 1.54 @@ -8,7 +8,7 @@ Name: nvidia-173xx-kmod Version: 173.14.39 # Taken over by kmodtool -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA 173xx display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -19,6 +19,8 @@ Source0: nvidia-kmod-data-%{version}.tar.bz2 +Patch0: nvidia_3.13_kernel.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i586 and i686 @@ -45,7 +47,7 @@ for arch in x86 x64 do pushd nvidiapkg-${arch} -echo "Nothing to patch" +%patch0 -p1 popd done @@ -89,6 +91,9 @@ %changelog +* Sun Jan 12 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.39-2 +- patch for 3.13 kernel + * Thu Dec 19 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 173.14.39-1 - Update to 173.14.39

10 years, 4 months

1
0
0 / 0

rpms/VirtualBox-kmod/F-18 VirtualBox-kmod.spec,1.74,1.75

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-kmod/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12851 Modified Files: VirtualBox-kmod.spec Log Message: * Sun Jan 12 2014 Sérgio Basto <sergio(a)serjux.com> - 4.2.22-1 - New upstream release and build akmods Index: VirtualBox-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-kmod/F-18/VirtualBox-kmod.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- VirtualBox-kmod.spec 3 Dec 2013 22:20:57 -0000 1.74 +++ VirtualBox-kmod.spec 12 Jan 2014 03:00:51 -0000 1.75 @@ -3,7 +3,7 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%global buildforkernels newest +#global buildforkernels newest # In prerelease builds (such as betas), this package has the same # major version number, while the kernel module abi is not guarranteed @@ -12,15 +12,15 @@ #global prerel RC4 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} -%global vboxrel 2 +%global vboxrel 1 %global vboxreltag %{?vboxrel:-%{vboxrel}} # Allow only root to access vboxdrv regardless of the file mode # use only for debugging! %bcond_without hardening Name: VirtualBox-kmod -Version: 4.2.18 -Release: 2%{?prerel:.%{prerel}}%{?dist}.7 +Version: 4.2.22 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -98,6 +98,9 @@ %changelog +* Sun Jan 12 2014 Sérgio Basto <sergio(a)serjux.com> - 4.2.22-1 +- New upstream release and build akmods + * Tue Dec 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.18-2.7 - Rebuilt for kernel

10 years, 4 months

1
0
0 / 0

rpms/VirtualBox/F-18 VirtualBox-4.3.6-mesa.patch,NONE,1.1

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8132 Added Files: VirtualBox-4.3.6-mesa.patch Log Message: cvs add VirtualBox-4.3.6-mesa.patch VirtualBox-4.3.6-mesa.patch: Config.kmk | 10 --- src/VBox/Additions/common/crOpenGL/Makefile.kmk | 35 ++++++----- src/VBox/Additions/common/crOpenGL/fakedri_drv.c | 70 +---------------------- src/VBox/Additions/common/crOpenGL/fakedri_drv.h | 7 -- 4 files changed, 26 insertions(+), 96 deletions(-) --- NEW FILE VirtualBox-4.3.6-mesa.patch --- fakedri_drv.c,h: Just compile with X11 system source and we may remove bundle X11 source code. --- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000 +++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100 @@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL endif if1of ($(KBUILD_TARGET), freebsd linux solaris) - # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2 - VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2 - VBOX_MESA_INCS = \ - $(VBOX_PATH_MESA_SOURCE) \ - $(VBOX_PATH_MESA_SOURCE)/include \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \ - $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common + VBOX_MESA_INCS = /usr/include/GL /usr/include/xorg /usr/include/pixman-1 endif VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/ --- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100 +++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100 @@ -82,18 +82,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_INCS += \ - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ - $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \ - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 \ $(VBOX_MESA_INCS) \ - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 + /usr/include/drm \ + /usr/include/libdrm VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif @@ -222,11 +216,20 @@ VBoxOGL_LIBS = \ $(VBOX_LIB_OGL_CRUTIL) \ $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) if1of ($(KBUILD_TARGET), linux solaris freebsd) - VBoxOGL_LIBS += \ - $(PATH_STAGE_LIB)/libXcomposite.so \ - $(PATH_STAGE_LIB)/libXdamage.so \ - $(PATH_STAGE_LIB)/libXfixes.so \ - $(PATH_STAGE_LIB)/libXext.so + if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86 ) + VBoxOGL_LIBS += \ + /usr/lib/libXcomposite.so \ + /usr/lib/libXdamage.so \ + /usr/lib/libXfixes.so \ + /usr/lib/libXext.so + endif + if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64 ) + VBoxOGL_LIBS += \ + /usr/lib64/libXcomposite.so \ + /usr/lib64/libXdamage.so \ + /usr/lib64/libXfixes.so \ + /usr/lib64/libXext.so + endif ifdef VBoxOGL_FAKEDRI ifeq ($(KBUILD_TARGET), freebsd) VBoxOGL_LIBS += \ --- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h.mesa 2013-12-18 16:06:06.000000000 +0000 +++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2013-12-24 17:01:55.086948605 +0000 @@ -20,13 +20,6 @@ #ifndef ___CROPENGL_FAKEDRIDRV_H #define ___CROPENGL_FAKEDRIDRV_H -#include "src/mesa/main/mtypes.h" -#include "src/mesa/main/dd.h" -#include "src/mesa/glapi/dispatch.h" -#include "src/mesa/glapi/glapi.h" -#include "src/mesa/glapi/glapitable.h" -#include "src/mesa/glapi/glapioffsets.h" -#include "src/mesa/drivers/dri/common/dri_util.h" #include "GL/internal/dri_interface.h" #include "glx_proto.h" --- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c.mesa 2013-12-18 16:06:06.000000000 +0000 +++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-12-24 19:56:30.880070340 +0000 @@ -17,7 +17,12 @@ */ #define _GNU_SOURCE 1 +#define HAVE_STRNDUP 1 +#include <xf86.h> +#include <xf86drm.h> +#include <GL/gl.h> +#include <GL/glext.h> #include "cr_error.h" #include "cr_gl.h" #include "cr_mem.h" @@ -38,20 +42,6 @@ #include <string.h> #endif -/** X server message type definitions. */ -typedef enum { - X_PROBED, /* Value was probed */ - X_CONFIG, /* Value was given in the config file */ - X_DEFAULT, /* Value is a default */ - X_CMDLINE, /* Value was given on the command line */ - X_NOTICE, /* Notice */ - X_ERROR, /* Error message */ - X_WARNING, /* Warning message */ - X_INFO, /* Informational message */ - X_NONE, /* No prefix */ - X_NOT_IMPLEMENTED, /* Not implemented */ - X_UNKNOWN = -1 /* unknown -- this must always be last */ -} MessageType; #define VBOX_NO_MESA_PATCH_REPORTS @@ -127,7 +117,6 @@ typedef struct _FAKEDRI_PatchNode static FAKEDRI_PatchNode *g_pFreeList=NULL, *g_pRepatchList=NULL; #endif -static struct _glapi_table* vbox_glapi_table = NULL; fakedri_glxapi_table glxim; static const __DRIextension **gppSwDriExternsion = NULL; @@ -136,54 +125,6 @@ static const __DRIswrastExtension *gpSwD extern const __DRIextension * __driDriverExtensions[]; -#define VBOX_SET_MESA_FUNC(table, name, func) \ - if (_glapi_get_proc_offset(name)>=0) SET_by_offset(table, _glapi_get_proc_offset(name), func); \ - else crWarning("%s not found in mesa table", name) - -#define GLAPI_ENTRY(Func) VBOX_SET_MESA_FUNC(vbox_glapi_table, "gl"#Func, cr_gl##Func); - -static void -vboxPatchMesaExport(const char* psFuncName, const void *pStart, const void *pEnd); - -static void -vboxPatchMesaGLAPITable() -{ - void *pGLTable; - - pGLTable = (void *)_glapi_get_dispatch(); - vbox_glapi_table = crAlloc(_glapi_get_dispatch_table_size() * sizeof (void *)); - if (!vbox_glapi_table) - { - crError("Not enough memory to allocate dispatch table"); - } - crMemcpy(vbox_glapi_table, pGLTable, _glapi_get_dispatch_table_size() * sizeof (void *)); - - #include "fakedri_glfuncsList.h" - - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glBlendEquationSeparateEXT", cr_glBlendEquationSeparate); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glSampleMaskSGIS", cr_glSampleMaskEXT); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glSamplePatternSGIS", cr_glSamplePatternEXT); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2dMESA", cr_glWindowPos2d); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2dvMESA", cr_glWindowPos2dv); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2fMESA", cr_glWindowPos2f); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2fvMESA", cr_glWindowPos2fv); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2iMESA", cr_glWindowPos2i); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2ivMESA", cr_glWindowPos2iv); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2sMESA", cr_glWindowPos2s); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2svMESA", cr_glWindowPos2sv); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3dMESA", cr_glWindowPos3d); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3dvMESA", cr_glWindowPos3dv); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3fMESA", cr_glWindowPos3f); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3fvMESA", cr_glWindowPos3fv); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3iMESA", cr_glWindowPos3i); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3ivMESA", cr_glWindowPos3iv); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3sMESA", cr_glWindowPos3s); - VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3svMESA", cr_glWindowPos3sv); - - _glapi_set_dispatch(vbox_glapi_table); -}; -#undef GLAPI_ENTRY - #define GLXAPI_ENTRY(Func) pGLXTable->Func = VBOXGLXTAG(glX##Func); static void vboxFillGLXAPITable(fakedri_glxapi_table *pGLXTable) @@ -686,7 +627,7 @@ void __attribute__ ((constructor)) vbox_ * Note, we don't need to install extension functions via _glapi_add_dispatch, because we'd override glXGetProcAddress. */ /* Mesa's dispatch table is different across library versions, have to modify mesa's table using offset info functions*/ - vboxPatchMesaGLAPITable(); + //vboxPatchMesaGLAPITable(); /* Handle glx api. * In the end application call would look like this:

10 years, 4 months

1
0
0 / 0

rpms/VirtualBox/F-18 .cvsignore, 1.48, 1.49 VirtualBox.spec, 1.37, 1.38 sources, 1.48, 1.49 VirtualBox-4.2.0-mesa.patch, 1.4, NONE VirtualBox-4.2.6-gcc48.patch, 1.1, NONE changeset_trunk_48529.diff, 1.1, NONE

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4705 Modified Files: .cvsignore VirtualBox.spec sources Removed Files: VirtualBox-4.2.0-mesa.patch VirtualBox-4.2.6-gcc48.patch changeset_trunk_48529.diff Log Message: * Sat Jan 11 2014 Sérgio Basto <sergio(a)serjux.com> - 4.2.22-1 - maintenance releases of older stable branches which improve stability and fix regressions. - drop changeset_trunk_48529.diff upstream patch. - using VirtualBox-4.3.6-mesa.patch, backport patch from F19+ builds. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 3 Oct 2013 19:37:50 -0000 1.48 +++ .cvsignore 11 Jan 2014 20:45:33 -0000 1.49 @@ -1 +1 @@ -VirtualBox-4.2.18.tar.bz2 +VirtualBox-4.2.22.tar.bz2 Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- VirtualBox.spec 3 Oct 2013 19:37:50 -0000 1.37 +++ VirtualBox.spec 11 Jan 2014 20:45:33 -0000 1.38 @@ -26,8 +26,8 @@ #endif Name: VirtualBox -Version: 4.2.18 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Version: 4.2.22 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -50,11 +50,9 @@ Patch17: VirtualBox-OSE-4.0.0-beramono.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch Patch22: VirtualBox-OSE-4.1.12-gsoap.patch -Patch23: VirtualBox-4.2.0-mesa.patch +Patch23: VirtualBox-4.3.6-mesa.patch Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch -Patch25: VirtualBox-4.2.0-xorg111.patch Patch26: VirtualBox-4.2.4-no-bundles.patch -Patch27: changeset_trunk_48529.diff %if 0%{?fedora} < 16 BuildRequires: kBuild >= 0.1.98 @@ -100,7 +98,6 @@ BuildRequires: mesa-libOSMesa-devel BuildRequires: pixman-devel BuildRequires: xorg-x11-proto-devel -BuildRequires: xorg-x11-server-source BuildRequires: xorg-x11-server-devel BuildRequires: libXcursor-devel BuildRequires: libXcomposite-devel @@ -229,11 +226,7 @@ %endif %patch23 -p1 -b .mesa %patch24 -p1 -b .guestlib -%if 0%{?fedora} < 17 -%patch25 -p1 -b .xorg111 -%endif %patch26 -p1 -b .nobundles -%patch27 -p1 -b .fix_shared_folders_for_Linux_3.11 # CRLF->LF sed -i 's/\r//' COPYING @@ -617,6 +610,12 @@ %changelog +* Sat Jan 11 2014 Sérgio Basto <sergio(a)serjux.com> - 4.2.22-1 +- maintenance releases of older stable branches which improve stability +and fix regressions. +- drop changeset_trunk_48529.diff upstream patch. +- using VirtualBox-4.3.6-mesa.patch, backport patch from F19+ builds. + * Sun Sep 29 2013 Sérgio Basto <sergio(a)serjux.com> - 4.2.18-2 - Additions/linux: fix shared folders for Linux 3.11 Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 3 Oct 2013 19:37:50 -0000 1.48 +++ sources 11 Jan 2014 20:45:34 -0000 1.49 @@ -1 +1 @@ -99cdf054b5e36aa83b60bd49fb50f943 VirtualBox-4.2.18.tar.bz2 +919bd83956fb9604ab5abf7de6e904ab VirtualBox-4.2.22.tar.bz2 --- VirtualBox-4.2.0-mesa.patch DELETED --- --- VirtualBox-4.2.6-gcc48.patch DELETED --- --- changeset_trunk_48529.diff DELETED ---

10 years, 4 months

1
0
0 / 0

rpms/kplayer/F-20 kplayer-docdir.patch, NONE, 1.1 kplayer-desktop-fix.patch, 1.1, 1.2 kplayer.spec, 1.13, 1.14

by Rex Dieter

Author: rdieter Update of /cvs/free/rpms/kplayer/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18793 Modified Files: kplayer-desktop-fix.patch kplayer.spec Added Files: kplayer-docdir.patch Log Message: * Sat Jan 11 2014 Rex Dieter <rdieter(a)fedoraproject.org> 1:0.7.0-10.20081211cvs - respin desktop-fix.patch so kbuildsycoca4 is happy too - docdir.patch - .spec cleanup kplayer-docdir.patch: da/CMakeLists.txt | 2 +- en/CMakeLists.txt | 2 +- es/CMakeLists.txt | 2 +- it/CMakeLists.txt | 2 +- pt/CMakeLists.txt | 2 +- sv/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE kplayer-docdir.patch --- diff -up kplayer/doc/da/CMakeLists.txt.docdir kplayer/doc/da/CMakeLists.txt --- kplayer/doc/da/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/da/CMakeLists.txt 2014-01-11 13:45:42.227980534 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/da SUBDIR kplayer ) diff -up kplayer/doc/en/CMakeLists.txt.docdir kplayer/doc/en/CMakeLists.txt --- kplayer/doc/en/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/en/CMakeLists.txt 2014-01-11 13:45:49.717910628 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kplayer ) diff -up kplayer/doc/es/CMakeLists.txt.docdir kplayer/doc/es/CMakeLists.txt --- kplayer/doc/es/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/es/CMakeLists.txt 2014-01-11 13:45:56.159850460 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/es SUBDIR kplayer ) diff -up kplayer/doc/it/CMakeLists.txt.docdir kplayer/doc/it/CMakeLists.txt --- kplayer/doc/it/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/it/CMakeLists.txt 2014-01-11 13:46:00.887806301 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/it SUBDIR kplayer ) diff -up kplayer/doc/pt/CMakeLists.txt.docdir kplayer/doc/pt/CMakeLists.txt --- kplayer/doc/pt/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/pt/CMakeLists.txt 2014-01-11 13:46:05.472763478 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt SUBDIR kplayer ) diff -up kplayer/doc/sv/CMakeLists.txt.docdir kplayer/doc/sv/CMakeLists.txt --- kplayer/doc/sv/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/sv/CMakeLists.txt 2014-01-11 13:46:11.402708094 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv SUBDIR kplayer ) kplayer-desktop-fix.patch: kplayer-actions.desktop | 2 +- kplayer-directory.desktop | 2 +- kplayer-next.desktop | 2 +- kplayer-play-queue.desktop | 2 +- kplayer.desktop | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) Index: kplayer-desktop-fix.patch =================================================================== RCS file: /cvs/free/rpms/kplayer/F-20/kplayer-desktop-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kplayer-desktop-fix.patch 15 Aug 2010 05:38:57 -0000 1.1 +++ kplayer-desktop-fix.patch 11 Jan 2014 19:54:25 -0000 1.2 @@ -1,75 +1,63 @@ ---- kplayer.old/kplayer/kplayer.desktop 2007-12-11 13:33:11.000000000 -0500 -+++ kplayer/kplayer/kplayer.desktop 2010-08-15 01:17:48.000000000 -0400 -@@ -1,64 +1,8 @@ +diff -up kplayer/kplayer/kplayer-actions.desktop.fixdesktop kplayer/kplayer/kplayer-actions.desktop +--- kplayer/kplayer/kplayer-actions.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer-actions.desktop 2014-01-11 13:28:26.272664837 -0600 +@@ -1,6 +1,6 @@ [Desktop Entry] --Encoding=UTF-8 + ServiceTypes=KonqPopupMenu/Plugin,audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,applicatio n/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory +-Actions=AddToNewPlaylist ++Actions=AddToNewPlaylist; + Encoding=UTF-8 + Type=Service + +diff -up kplayer/kplayer/kplayer.desktop.fixdesktop kplayer/kplayer/kplayer.desktop +--- kplayer/kplayer/kplayer.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer.desktop 2014-01-11 13:31:22.626014867 -0600 +@@ -2,7 +2,7 @@ + Encoding=UTF-8 Type=Application Exec=kplayer -- %U -Icon=kplayer.png +Icon=kplayer DocPath=kplayer/index.html --Comment=Media Player --Comment[af]=Media Speler --Comment[ar]=قارئ الوسائط --Comment[be]=Медыяпрайгравальнік --Comment[bg]=Медия плеър --Comment[br]=Soner liesvedia --Comment[ca]=Reproductor multimèdia --Comment[cs]=Přehrávač médií --Comment[cy]=Chwaraeydd Cyfryngau --Comment[da]=Medieafspiller --Comment[de]=Medienwiedergabe --Comment[el]=Αναπαραγωγή πολυμέσων --Comment[eo]=Ludilo por sonor-dosieroj --Comment[es]=Reproductor multimedia --Comment[et]=Meediamängija --Comment[eu]=Media Jolea --Comment[fi]=Mediasoitin --Comment[fr]=Lecteur multimédia --Comment[ga]=Seinnteoir Meán --Comment[gl]=Reprodutor Multimédia --Comment[he]=נגן מדיה --Comment[hi]=मीडिया प्लेयर --Comment[hu]=Médialejátszó --Comment[it]=Lettore multimediale --Comment[ja]=メディアプレーヤ --Comment[ka]=მედიადამკვრელი --Comment[lt]=Daugialypės terpės grotuvas --Comment[lv]=Mēdiju Atskaņotājs --Comment[mk]=Изведувач на мултимедиа --Comment[nb]=Mediaspiller --Comment[nl]=Mediaspeler --Comment[nn]=Mediespelar --Comment[pa]=ਮੀਡਿਆ ਪਲੇਅਰ --Comment[pl]=Odtwarzacz multimedialny --Comment[pt]=Leitor multimédia --Comment[pt_BR]=Reprodutor de mídia --Comment[ro]=Program de redare multimedia --Comment[ru]=Медиаплеер --Comment[se]=Mediačuojaheaddji --Comment[sk]=Prehrávač médií --Comment[sl]=Večpredstavnostni predvajalnik --Comment[sr]=Медија плејер --Comment[sr@Latn]=Medija plejer --Comment[sv]=Mediaspelare --Comment[ta]=ஊடக ப்ளேயர் --Comment[th]=เครื่องเล่นแฟ้มสื่อ --Comment[tr]=Medya Oynatıcı --Comment[uk]=Програвач мультимедії --Comment[uz]=Медиа плейер --Comment[ven]=Tshitambi tsha Media --Comment[xh]=Umdlali we Midia --Comment[xx]=xxMedia Playerxx --Comment[zh_CN]=媒体播放器 --Comment[zh_TW]=多媒體播放器 --Comment[zu]=Umdlali Wezezindaba - Terminal=false - Name=KPlayer - GenericName=Media Player -@@ -116,5 +60,5 @@ GenericName[xx]=xxMedia Playerxx + Comment=Media Player + Comment[af]=Media Speler +@@ -116,5 +116,5 @@ GenericName[xx]=xxMedia Playerxx GenericName[zh_CN]=媒体播放器 GenericName[zh_TW]=多媒體播放器 GenericName[zu]=Umdlali Wezezindaba -MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;applic ation/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer;uri/mms;uri/mmst;uri/mmsu;uri/pnm;uri/rtsp;uri/rtspt;uri/rtspu; +MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;applic ation/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer; Categories=AudioVideo;Player;Qt;KDE; +diff -up kplayer/kplayer/kplayer-directory.desktop.fixdesktop kplayer/kplayer/kplayer-directory.desktop +--- kplayer/kplayer/kplayer-directory.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer-directory.desktop 2014-01-11 13:26:42.519635833 -0600 +@@ -1,6 +1,6 @@ + [Desktop Entry] + ServiceTypes=KonqPopupMenu/Plugin,inode/directory +-Actions=AddToPlaylists;AddToCollection ++Actions=AddToPlaylists;AddToCollection; + Encoding=UTF-8 + Type=Service + +diff -up kplayer/kplayer/kplayer-next.desktop.fixdesktop kplayer/kplayer/kplayer-next.desktop +--- kplayer/kplayer/kplayer-next.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer-next.desktop 2014-01-11 13:28:39.143544398 -0600 +@@ -1,6 +1,6 @@ + [Desktop Entry] + ServiceTypes=KonqPopupMenu/Plugin,audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,applicatio n/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd +-Actions=PlayNext;QueueNext ++Actions=PlayNext;QueueNext; + Encoding=UTF-8 + Type=Service + +diff -up kplayer/kplayer/kplayer-play-queue.desktop.fixdesktop kplayer/kplayer/kplayer-play-queue.desktop +--- kplayer/kplayer/kplayer-play-queue.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer-play-queue.desktop 2014-01-11 13:28:59.166357042 -0600 +@@ -1,6 +1,6 @@ + [Desktop Entry] + ServiceTypes=KonqPopupMenu/Plugin,audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,applicatio n/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd +-Actions=Play;Queue ++Actions=Play;Queue; + X-KDE-Priority=TopLevel + Encoding=UTF-8 + Type=Service Index: kplayer.spec =================================================================== RCS file: /cvs/free/rpms/kplayer/F-20/kplayer.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kplayer.spec 27 May 2013 19:04:24 -0000 1.13 +++ kplayer.spec 11 Jan 2014 19:54:25 -0000 1.14 @@ -3,9 +3,8 @@ Name: kplayer Epoch: 1 Version: 0.7.0 -Release: 9.%cvsversion%{?dist} +Release: 10.%cvsversion%{?dist} Summary: A media player based on MPlayer -Group: Applications/Multimedia License: GPLv3+ and GFDL URL: http://kplayer.sourceforge.net/ Source0: %{name}-%{version}-%cvsversion.tar.bz2 @@ -14,11 +13,12 @@ Patch0: %{name}-linking.patch # Match the .desktop file to freedesktop standards Patch1: %{name}-desktop-fix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Fix docdir install path +Patch2: %{name}-docdir.patch BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: kdelibs-devel +BuildRequires: kdelibs4-devel Requires: mplayer #Requires(hint): libdvdcss @@ -42,47 +42,26 @@ %setup -q -n %{name} %patch0 -p1 -b .linking %patch1 -p1 -b .fixdesktop +%patch2 -p1 -b .docdir -%{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON . +%{cmake_kde4} . # Fix documentation build sed -i 's|V4.1.2|V4.2|' doc/*/index.docbook %build -make %{?_smp_mflags} VERBOSE=1 +make %{?_smp_mflags} %install -rm -rf %{buildroot} - -make install DESTDIR=%{buildroot} +make install/fast DESTDIR=%{buildroot} ## File lists # locale's -%find_lang %{name} || touch %{name}.lang -# HTML (1.0) -HTML_DIR=$(kde4-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - # Install HTML docs in the correct location and - mv $lang_dir $lang_dir.TMP - mkdir $lang_dir - mv $lang_dir.TMP $lang_dir/%{name} - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi +%find_lang %{name} --with-kde # Install servicemenus in the correct location: mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ -mv %{buildroot}%{_kde4_datadir}/kde4/apps/konqueror/servicemenus/* \ +mv %{buildroot}%{_kde4_appsdir}/konqueror/servicemenus/* \ %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ @@ -90,9 +69,6 @@ desktop-file-validate \ %{buildroot}%{_kde4_datadir}/applications/kde4/kplayer.desktop -%clean -rm -rf %{buildroot} - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -109,20 +85,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING* README TODO %{_kde4_bindir}/%{name} %{_kde4_datadir}/applications/kde4/*%{name}.desktop -%{_kde4_datadir}/kde4/apps/%{name}/ +%{_kde4_appsdir}/%{name}/ %{_kde4_datadir}/kde4/services/*%{name}*.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/ -%{_kde4_datadir}/icons/hicolor/*/*/* +%{_kde4_datadir}/kde4/services/ServiceMenus/* +%{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_libdir}/kde4/lib%{name}part.* %changelog +* Sat Jan 11 2014 Rex Dieter <rdieter(a)fedoraproject.org> 1:0.7.0-10.20081211cvs +- respin desktop-fix.patch so kbuildsycoca4 is happy too +- docdir.patch +- .spec cleanup + * Mon May 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.7.0-9.20081211cvs - Rebuilt for x264/FFmpeg

10 years, 4 months

1
0
0 / 0

rpms/kplayer/devel kplayer-docdir.patch, NONE, 1.1 kplayer-desktop-fix.patch, 1.1, 1.2 kplayer.spec, 1.13, 1.14

by Rex Dieter

Author: rdieter Update of /cvs/free/rpms/kplayer/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18402 Modified Files: kplayer-desktop-fix.patch kplayer.spec Added Files: kplayer-docdir.patch Log Message: * Sat Jan 11 2014 Rex Dieter <rdieter(a)fedoraproject.org> 1:0.7.0-10.20081211cvs - respin desktop-fix.patch so kbuildsycoca4 is happy too - docdir.patch - .spec cleanup kplayer-docdir.patch: da/CMakeLists.txt | 2 +- en/CMakeLists.txt | 2 +- es/CMakeLists.txt | 2 +- it/CMakeLists.txt | 2 +- pt/CMakeLists.txt | 2 +- sv/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE kplayer-docdir.patch --- diff -up kplayer/doc/da/CMakeLists.txt.docdir kplayer/doc/da/CMakeLists.txt --- kplayer/doc/da/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/da/CMakeLists.txt 2014-01-11 13:45:42.227980534 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/da SUBDIR kplayer ) diff -up kplayer/doc/en/CMakeLists.txt.docdir kplayer/doc/en/CMakeLists.txt --- kplayer/doc/en/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/en/CMakeLists.txt 2014-01-11 13:45:49.717910628 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kplayer ) diff -up kplayer/doc/es/CMakeLists.txt.docdir kplayer/doc/es/CMakeLists.txt --- kplayer/doc/es/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/es/CMakeLists.txt 2014-01-11 13:45:56.159850460 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/es SUBDIR kplayer ) diff -up kplayer/doc/it/CMakeLists.txt.docdir kplayer/doc/it/CMakeLists.txt --- kplayer/doc/it/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/it/CMakeLists.txt 2014-01-11 13:46:00.887806301 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/it SUBDIR kplayer ) diff -up kplayer/doc/pt/CMakeLists.txt.docdir kplayer/doc/pt/CMakeLists.txt --- kplayer/doc/pt/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/pt/CMakeLists.txt 2014-01-11 13:46:05.472763478 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt SUBDIR kplayer ) diff -up kplayer/doc/sv/CMakeLists.txt.docdir kplayer/doc/sv/CMakeLists.txt --- kplayer/doc/sv/CMakeLists.txt.docdir 2008-01-11 12:24:07.000000000 -0600 +++ kplayer/doc/sv/CMakeLists.txt 2014-01-11 13:46:11.402708094 -0600 @@ -1 +1 @@ -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}) +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv SUBDIR kplayer ) kplayer-desktop-fix.patch: kplayer-actions.desktop | 2 +- kplayer-directory.desktop | 2 +- kplayer-next.desktop | 2 +- kplayer-play-queue.desktop | 2 +- kplayer.desktop | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) Index: kplayer-desktop-fix.patch =================================================================== RCS file: /cvs/free/rpms/kplayer/devel/kplayer-desktop-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kplayer-desktop-fix.patch 15 Aug 2010 05:38:57 -0000 1.1 +++ kplayer-desktop-fix.patch 11 Jan 2014 19:52:21 -0000 1.2 @@ -1,75 +1,63 @@ ---- kplayer.old/kplayer/kplayer.desktop 2007-12-11 13:33:11.000000000 -0500 -+++ kplayer/kplayer/kplayer.desktop 2010-08-15 01:17:48.000000000 -0400 -@@ -1,64 +1,8 @@ +diff -up kplayer/kplayer/kplayer-actions.desktop.fixdesktop kplayer/kplayer/kplayer-actions.desktop +--- kplayer/kplayer/kplayer-actions.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer-actions.desktop 2014-01-11 13:28:26.272664837 -0600 +@@ -1,6 +1,6 @@ [Desktop Entry] --Encoding=UTF-8 + ServiceTypes=KonqPopupMenu/Plugin,audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,applicatio n/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory +-Actions=AddToNewPlaylist ++Actions=AddToNewPlaylist; + Encoding=UTF-8 + Type=Service + +diff -up kplayer/kplayer/kplayer.desktop.fixdesktop kplayer/kplayer/kplayer.desktop +--- kplayer/kplayer/kplayer.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer.desktop 2014-01-11 13:31:22.626014867 -0600 +@@ -2,7 +2,7 @@ + Encoding=UTF-8 Type=Application Exec=kplayer -- %U -Icon=kplayer.png +Icon=kplayer DocPath=kplayer/index.html --Comment=Media Player --Comment[af]=Media Speler --Comment[ar]=قارئ الوسائط --Comment[be]=Медыяпрайгравальнік --Comment[bg]=Медия плеър --Comment[br]=Soner liesvedia --Comment[ca]=Reproductor multimèdia --Comment[cs]=Přehrávač médií --Comment[cy]=Chwaraeydd Cyfryngau --Comment[da]=Medieafspiller --Comment[de]=Medienwiedergabe --Comment[el]=Αναπαραγωγή πολυμέσων --Comment[eo]=Ludilo por sonor-dosieroj --Comment[es]=Reproductor multimedia --Comment[et]=Meediamängija --Comment[eu]=Media Jolea --Comment[fi]=Mediasoitin --Comment[fr]=Lecteur multimédia --Comment[ga]=Seinnteoir Meán --Comment[gl]=Reprodutor Multimédia --Comment[he]=נגן מדיה --Comment[hi]=मीडिया प्लेयर --Comment[hu]=Médialejátszó --Comment[it]=Lettore multimediale --Comment[ja]=メディアプレーヤ --Comment[ka]=მედიადამკვრელი --Comment[lt]=Daugialypės terpės grotuvas --Comment[lv]=Mēdiju Atskaņotājs --Comment[mk]=Изведувач на мултимедиа --Comment[nb]=Mediaspiller --Comment[nl]=Mediaspeler --Comment[nn]=Mediespelar --Comment[pa]=ਮੀਡਿਆ ਪਲੇਅਰ --Comment[pl]=Odtwarzacz multimedialny --Comment[pt]=Leitor multimédia --Comment[pt_BR]=Reprodutor de mídia --Comment[ro]=Program de redare multimedia --Comment[ru]=Медиаплеер --Comment[se]=Mediačuojaheaddji --Comment[sk]=Prehrávač médií --Comment[sl]=Večpredstavnostni predvajalnik --Comment[sr]=Медија плејер --Comment[sr@Latn]=Medija plejer --Comment[sv]=Mediaspelare --Comment[ta]=ஊடக ப்ளேயர் --Comment[th]=เครื่องเล่นแฟ้มสื่อ --Comment[tr]=Medya Oynatıcı --Comment[uk]=Програвач мультимедії --Comment[uz]=Медиа плейер --Comment[ven]=Tshitambi tsha Media --Comment[xh]=Umdlali we Midia --Comment[xx]=xxMedia Playerxx --Comment[zh_CN]=媒体播放器 --Comment[zh_TW]=多媒體播放器 --Comment[zu]=Umdlali Wezezindaba - Terminal=false - Name=KPlayer - GenericName=Media Player -@@ -116,5 +60,5 @@ GenericName[xx]=xxMedia Playerxx + Comment=Media Player + Comment[af]=Media Speler +@@ -116,5 +116,5 @@ GenericName[xx]=xxMedia Playerxx GenericName[zh_CN]=媒体播放器 GenericName[zh_TW]=多媒體播放器 GenericName[zu]=Umdlali Wezezindaba -MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;applic ation/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer;uri/mms;uri/mmst;uri/mmsu;uri/pnm;uri/rtsp;uri/rtspt;uri/rtspu; +MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;applic ation/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer; Categories=AudioVideo;Player;Qt;KDE; +diff -up kplayer/kplayer/kplayer-directory.desktop.fixdesktop kplayer/kplayer/kplayer-directory.desktop +--- kplayer/kplayer/kplayer-directory.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer-directory.desktop 2014-01-11 13:26:42.519635833 -0600 +@@ -1,6 +1,6 @@ + [Desktop Entry] + ServiceTypes=KonqPopupMenu/Plugin,inode/directory +-Actions=AddToPlaylists;AddToCollection ++Actions=AddToPlaylists;AddToCollection; + Encoding=UTF-8 + Type=Service + +diff -up kplayer/kplayer/kplayer-next.desktop.fixdesktop kplayer/kplayer/kplayer-next.desktop +--- kplayer/kplayer/kplayer-next.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer-next.desktop 2014-01-11 13:28:39.143544398 -0600 +@@ -1,6 +1,6 @@ + [Desktop Entry] + ServiceTypes=KonqPopupMenu/Plugin,audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,applicatio n/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd +-Actions=PlayNext;QueueNext ++Actions=PlayNext;QueueNext; + Encoding=UTF-8 + Type=Service + +diff -up kplayer/kplayer/kplayer-play-queue.desktop.fixdesktop kplayer/kplayer/kplayer-play-queue.desktop +--- kplayer/kplayer/kplayer-play-queue.desktop.fixdesktop 2007-12-11 12:33:11.000000000 -0600 ++++ kplayer/kplayer/kplayer-play-queue.desktop 2014-01-11 13:28:59.166357042 -0600 +@@ -1,6 +1,6 @@ + [Desktop Entry] + ServiceTypes=KonqPopupMenu/Plugin,audio/mp3,audio/mpeg3,audio/mpeg4,audio/mpg,audio/mpeg,audio/mpegurl,audio/m3u,audio/mp4,audio/wav,video/msvideo,video/mpeg4,video/mpeg,video/x-m4v,video/x-mpeg,video/x-mpeg2,video/mp4,video/x-msmpeg,video/vnd.mpegurl,video/x-mpegurl,video/x-msvideo,video/quicktime,video/x-qtc,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wma,audio/x-ms-wax,audio/x-ms-wmp,audio/x-ms-wmv,video/x-ms-asf,video/x-ms-asf-plugin,video/x-ms-asx,video/x-ms-wax,video/x-ms-wmp,video/x-ms-wmv,video/x-ms-wma,video/x-ms-wvx,video/x-ms-wmx,video/x-ms-wm,application/asx,application/x-ms-asf,application/vnd.ms-asf,application/x-ms-wmd,application/x-ms-wmz,audio/scpls,audio/x-scpls,audio/x-pls,audio/vnd.mpegurl,audio/x-mpg,audio/x-mpeg,audio/x-mpeg3,audio/x-mpegurl,audio/x-realaudio,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,application/x-pn-realaudio,audio/vnd.rn-realaudio,video/x-realvideo,video/x-pn-realvideo,video/vnd.rn-realvideo,video/x-pn-realvideo-plugin,applicatio n/vnd.rn-realmedia,application/vnd.rn-realmedia-vbr,application/vnd.rn-realplayer,application/sdp,application/smil,application/x-smil,application/streamingmedia,application/x-streamingmedia,video/nsv,audio/x-mp3,video/x-ogm,video/x-theora,audio/vorbis,audio/x-vorbis,audio/x-oggflac,application/x-ogg,application/ogg,audio/mp1,audio/x-mp1,audio/mp2,audio/x-mp2,audio/x-wav,video/avi,video/x-avi,video/x-divx,video/x-fli,video/x-matroska,audio/x-matroska,application/x-mplayer2,application/x-cda,audio/aac,audio/ac3,audio/basic,audio/m4a,audio/x-aac,audio/x-adpcm,audio/x-flac,audio/x-m3u,audio/x-m4a,audio/x-musepack,audio/x-pn-windows-pcm,video/x-3gpp,video/x-3gpp2,video/mediaplayer,uri/mms,uri/mmst,uri/mmsu,uri/pnm,uri/rtsp,uri/rtspt,uri/rtspu,inode/directory,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/cdwriter_unmounted,media/dvd_mounted,media/dvd_unmounted,media/audiocd,media/dvdvideo,media/svcd,media/vcd +-Actions=Play;Queue ++Actions=Play;Queue; + X-KDE-Priority=TopLevel + Encoding=UTF-8 + Type=Service Index: kplayer.spec =================================================================== RCS file: /cvs/free/rpms/kplayer/devel/kplayer.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kplayer.spec 27 May 2013 19:04:24 -0000 1.13 +++ kplayer.spec 11 Jan 2014 19:52:21 -0000 1.14 @@ -3,9 +3,8 @@ Name: kplayer Epoch: 1 Version: 0.7.0 -Release: 9.%cvsversion%{?dist} +Release: 10.%cvsversion%{?dist} Summary: A media player based on MPlayer -Group: Applications/Multimedia License: GPLv3+ and GFDL URL: http://kplayer.sourceforge.net/ Source0: %{name}-%{version}-%cvsversion.tar.bz2 @@ -14,11 +13,12 @@ Patch0: %{name}-linking.patch # Match the .desktop file to freedesktop standards Patch1: %{name}-desktop-fix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Fix docdir install path +Patch2: %{name}-docdir.patch BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: kdelibs-devel +BuildRequires: kdelibs4-devel Requires: mplayer #Requires(hint): libdvdcss @@ -42,47 +42,26 @@ %setup -q -n %{name} %patch0 -p1 -b .linking %patch1 -p1 -b .fixdesktop +%patch2 -p1 -b .docdir -%{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON . +%{cmake_kde4} . # Fix documentation build sed -i 's|V4.1.2|V4.2|' doc/*/index.docbook %build -make %{?_smp_mflags} VERBOSE=1 +make %{?_smp_mflags} %install -rm -rf %{buildroot} - -make install DESTDIR=%{buildroot} +make install/fast DESTDIR=%{buildroot} ## File lists # locale's -%find_lang %{name} || touch %{name}.lang -# HTML (1.0) -HTML_DIR=$(kde4-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - # Install HTML docs in the correct location and - mv $lang_dir $lang_dir.TMP - mkdir $lang_dir - mv $lang_dir.TMP $lang_dir/%{name} - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi +%find_lang %{name} --with-kde # Install servicemenus in the correct location: mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ -mv %{buildroot}%{_kde4_datadir}/kde4/apps/konqueror/servicemenus/* \ +mv %{buildroot}%{_kde4_appsdir}/konqueror/servicemenus/* \ %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ @@ -90,9 +69,6 @@ desktop-file-validate \ %{buildroot}%{_kde4_datadir}/applications/kde4/kplayer.desktop -%clean -rm -rf %{buildroot} - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -109,20 +85,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING* README TODO %{_kde4_bindir}/%{name} %{_kde4_datadir}/applications/kde4/*%{name}.desktop -%{_kde4_datadir}/kde4/apps/%{name}/ +%{_kde4_appsdir}/%{name}/ %{_kde4_datadir}/kde4/services/*%{name}*.desktop -%{_kde4_datadir}/kde4/services/ServiceMenus/ -%{_kde4_datadir}/icons/hicolor/*/*/* +%{_kde4_datadir}/kde4/services/ServiceMenus/* +%{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_libdir}/kde4/lib%{name}part.* %changelog +* Sat Jan 11 2014 Rex Dieter <rdieter(a)fedoraproject.org> 1:0.7.0-10.20081211cvs +- respin desktop-fix.patch so kbuildsycoca4 is happy too +- docdir.patch +- .spec cleanup + * Mon May 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.7.0-9.20081211cvs - Rebuilt for x264/FFmpeg

10 years, 4 months

1
0
0 / 0

rpms/libbdplus/F-19 libbdplus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Xavier Bachelot

Author: xavierb Update of /cvs/free/rpms/libbdplus/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25758/F-19 Modified Files: .cvsignore sources Added Files: libbdplus.spec Log Message: import to F-20, F-19 and EL-6 --- NEW FILE libbdplus.spec --- Name: libbdplus Version: 0.1.0 Release: 2%{?dist} Summary: Open implementation of BD+ protocol License: LGPLv2+ URL: http://www.videolan.org/developers/libbdplus.html Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}... BuildRequires: libgcrypt-devel BuildRequires: libaacs-devel >= 0.7.0 %description libbdplus is a research project to implement the BD+ System Specifications. This research project provides, through an open-source library, a way to understand how the BD+ protocol works. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install %make_install find %{buildroot} -name '*.la' -delete %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %doc COPYING ChangeLog README.txt %{_libdir}/*.so.* %files devel %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc %changelog * Wed Jan 08 2014 Xavier Bachelot <xavier(a)bachelot.org> 0.1.0-2 - Add version to libaacs BuildRequires:. - Remove Group: tags. - Use %%make_install macro. - Minor specfile fixes. * Fri Dec 27 2013 Xavier Bachelot <xavier(a)bachelot.org> 0.1.0-1 - Initial release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libbdplus/F-19/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jan 2014 11:33:56 -0000 1.1 +++ .cvsignore 11 Jan 2014 15:18:30 -0000 1.2 @@ -0,0 +1 @@ +libbdplus-0.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/libbdplus/F-19/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jan 2014 11:33:56 -0000 1.1 +++ sources 11 Jan 2014 15:18:30 -0000 1.2 @@ -0,0 +1 @@ +4cf74020b91aafa33075e8ceef4d0e40 libbdplus-0.1.0.tar.bz2

10 years, 4 months

1
0
0 / 0

rpms/libbdplus/EL-6 libbdplus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Xavier Bachelot

Author: xavierb Update of /cvs/free/rpms/libbdplus/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25758/EL-6 Modified Files: .cvsignore sources Added Files: libbdplus.spec Log Message: import to F-20, F-19 and EL-6 --- NEW FILE libbdplus.spec --- Name: libbdplus Version: 0.1.0 Release: 2%{?dist} Summary: Open implementation of BD+ protocol License: LGPLv2+ URL: http://www.videolan.org/developers/libbdplus.html Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}... BuildRequires: libgcrypt-devel BuildRequires: libaacs-devel >= 0.7.0 %description libbdplus is a research project to implement the BD+ System Specifications. This research project provides, through an open-source library, a way to understand how the BD+ protocol works. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install %make_install find %{buildroot} -name '*.la' -delete %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %doc COPYING ChangeLog README.txt %{_libdir}/*.so.* %files devel %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc %changelog * Wed Jan 08 2014 Xavier Bachelot <xavier(a)bachelot.org> 0.1.0-2 - Add version to libaacs BuildRequires:. - Remove Group: tags. - Use %%make_install macro. - Minor specfile fixes. * Fri Dec 27 2013 Xavier Bachelot <xavier(a)bachelot.org> 0.1.0-1 - Initial release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libbdplus/EL-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jan 2014 11:33:56 -0000 1.1 +++ .cvsignore 11 Jan 2014 15:18:30 -0000 1.2 @@ -0,0 +1 @@ +libbdplus-0.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/libbdplus/EL-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jan 2014 11:33:56 -0000 1.1 +++ sources 11 Jan 2014 15:18:30 -0000 1.2 @@ -0,0 +1 @@ +4cf74020b91aafa33075e8ceef4d0e40 libbdplus-0.1.0.tar.bz2

10 years, 4 months

1
0
0 / 0

rpms/libbdplus/F-20 libbdplus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Xavier Bachelot

Author: xavierb Update of /cvs/free/rpms/libbdplus/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25758/F-20 Modified Files: .cvsignore sources Added Files: libbdplus.spec Log Message: import to F-20, F-19 and EL-6 --- NEW FILE libbdplus.spec --- Name: libbdplus Version: 0.1.0 Release: 2%{?dist} Summary: Open implementation of BD+ protocol License: LGPLv2+ URL: http://www.videolan.org/developers/libbdplus.html Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}... BuildRequires: libgcrypt-devel BuildRequires: libaacs-devel >= 0.7.0 %description libbdplus is a research project to implement the BD+ System Specifications. This research project provides, through an open-source library, a way to understand how the BD+ protocol works. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install %make_install find %{buildroot} -name '*.la' -delete %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %doc COPYING ChangeLog README.txt %{_libdir}/*.so.* %files devel %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc %changelog * Wed Jan 08 2014 Xavier Bachelot <xavier(a)bachelot.org> 0.1.0-2 - Add version to libaacs BuildRequires:. - Remove Group: tags. - Use %%make_install macro. - Minor specfile fixes. * Fri Dec 27 2013 Xavier Bachelot <xavier(a)bachelot.org> 0.1.0-1 - Initial release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libbdplus/F-20/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Jan 2014 11:33:56 -0000 1.1 +++ .cvsignore 11 Jan 2014 15:18:30 -0000 1.2 @@ -0,0 +1 @@ +libbdplus-0.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/libbdplus/F-20/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Jan 2014 11:33:56 -0000 1.1 +++ sources 11 Jan 2014 15:18:30 -0000 1.2 @@ -0,0 +1 @@ +4cf74020b91aafa33075e8ceef4d0e40 libbdplus-0.1.0.tar.bz2

10 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits January 2014