rpms/lpf-spotify-client/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/lpf-spotify-client/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsc17669/rpms/lpf-spotify-client/devel
Log Message:
Directory /cvs/nonfree/rpms/lpf-spotify-client/devel added to the repository
10 years, 5 months
rpms/lpf-spotify-client - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/lpf-spotify-client
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsc17669/rpms/lpf-spotify-client
Log Message:
Directory /cvs/nonfree/rpms/lpf-spotify-client added to the repository
10 years, 5 months
rpms/mjpegtools/devel mjpegtools.spec,1.16,1.17
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/mjpegtools/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26769
Modified Files:
mjpegtools.spec
Log Message:
* Tue Nov 19 2013 Sérgio Basto <sergio(a)serjux.com> - 2.1.0-3
- Better obsoletes/provides for y4mscaler.
Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/devel/mjpegtools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mjpegtools.spec 19 Nov 2013 21:47:09 -0000 1.16
+++ mjpegtools.spec 19 Nov 2013 23:43:39 -0000 1.17
@@ -1,6 +1,6 @@
Name: mjpegtools
Version: 2.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
License: GPLv2
@@ -20,7 +20,9 @@
Requires: mencoder
# ffmpeg main package, y4mscaler and which for anytovcd.sh
Requires: ffmpeg
-Obsoletes: y4mscaler
+Provides: y4mscaler = 9.0-14
+# Could be dropped on Fedora 22
+Obsoletes: y4mscaler < 9.0-14
Requires: which
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -179,6 +181,9 @@
%changelog
+* Tue Nov 19 2013 Sérgio Basto <sergio(a)serjux.com> - 2.1.0-3
+- Better obsoletes/provides for y4mscaler.
+
* Tue Nov 19 2013 Sérgio Basto <sergio(a)serjux.com> - 2.1.0-2
- Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into
mjpegtools-2.1.0
10 years, 5 months
rpms/lpf-skype/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/lpf-skype/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsw23807/rpms/lpf-skype/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module lpf-skype
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: lpf-skype
# $Id: Makefile,v 1.1 2013/11/19 21:50:05 kwizart Exp $
NAME := lpf-skype
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
10 years, 5 months
rpms/lpf-skype Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/lpf-skype
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsw23807/rpms/lpf-skype
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module lpf-skype
--- NEW FILE Makefile ---
# Top level Makefile for module lpf-skype
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
10 years, 5 months
rpms/lpf-skype/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/lpf-skype/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsw23807/rpms/lpf-skype/devel
Log Message:
Directory /cvs/nonfree/rpms/lpf-skype/devel added to the repository
10 years, 5 months
rpms/lpf-skype - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/lpf-skype
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsw23807/rpms/lpf-skype
Log Message:
Directory /cvs/nonfree/rpms/lpf-skype added to the repository
10 years, 5 months
rpms/mjpegtools/devel mjpegtools.spec,1.15,1.16
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/mjpegtools/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23562
Modified Files:
mjpegtools.spec
Log Message:
* Tue Nov 19 2013 Sérgio Basto <sergio(a)serjux.com> - 2.1.0-2
- Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into
mjpegtools-2.1.0
Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/devel/mjpegtools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mjpegtools.spec 8 Nov 2013 02:26:27 -0000 1.15
+++ mjpegtools.spec 19 Nov 2013 21:47:09 -0000 1.16
@@ -1,6 +1,6 @@
Name: mjpegtools
Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
License: GPLv2
@@ -20,7 +20,7 @@
Requires: mencoder
# ffmpeg main package, y4mscaler and which for anytovcd.sh
Requires: ffmpeg
-Requires: y4mscaler
+Obsoletes: y4mscaler
Requires: which
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -179,6 +179,10 @@
%changelog
+* Tue Nov 19 2013 Sérgio Basto <sergio(a)serjux.com> - 2.1.0-2
+- Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into
+ mjpegtools-2.1.0
+
* Thu Nov 07 2013 Sérgio Basto <sergio(a)serjux.com> - 2.1.0-1
- Update to 2.1.0
- Drop upstreamed patches.
10 years, 5 months
rpms/dolphin-emu/devel dolphin-emu-3.5-compat-SFML16.patch, NONE, 1.1 dolphin-emu.spec, 1.5, 1.6
by Jeremy Newton
Author: jem256
Update of /cvs/nonfree/rpms/dolphin-emu/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3363/devel
Modified Files:
dolphin-emu.spec
Added Files:
dolphin-emu-3.5-compat-SFML16.patch
Log Message:
Update compat SFML 16 with patch
dolphin-emu-3.5-compat-SFML16.patch:
CMakeLists.txt | 1 +
CMakeTests/FindSFML.cmake | 6 +++---
Source/Core/Core/CMakeLists.txt | 2 +-
Source/Core/DolphinWX/CMakeLists.txt | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
--- NEW FILE dolphin-emu-3.5-compat-SFML16.patch ---
diff -up dolphin-emu-3.5/CMakeTests/FindSFML.cmake~ dolphin-emu-3.5/CMakeTests/FindSFML.cmake
--- dolphin-emu-3.5/CMakeTests/FindSFML.cmake~ 2013-02-20 00:38:34.000000000 +0100
+++ dolphin-emu-3.5/CMakeTests/FindSFML.cmake 2013-11-18 11:57:56.150949832 +0100
@@ -24,7 +24,7 @@ endif()
# find the SFML include directory
find_path(SFML_INCLUDE_DIR SFML/Config.hpp
- PATH_SUFFIXES include
+ PATH_SUFFIXES include/sfml1
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -87,11 +87,11 @@ set(FIND_SFML_LIB_PATHS ~/Library/Framew
foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
- set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
+ set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX}-1.6)
# no suffix for sfml-main, it is always a static library
if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
- set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+ set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}-1.6)
endif()
# debug library
diff -up dolphin-emu-3.5/CMakeLists.txt~ dolphin-emu-3.5/CMakeLists.txt
--- dolphin-emu-3.5/CMakeLists.txt~ 2013-11-18 11:58:43.000000000 +0100
+++ dolphin-emu-3.5/CMakeLists.txt 2013-11-18 12:00:41.120408310 +0100
@@ -417,6 +417,7 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Dar
endif()
if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
message("Using shared SFML")
+ include_directories( /usr/include/sfml1 )
else()
message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
add_subdirectory(Externals/SFML)
diff -up dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt~ dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt
--- dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt~ 2013-02-20 00:38:35.000000000 +0100
+++ dolphin-emu-3.5/Source/Core/Core/CMakeLists.txt 2013-11-18 12:14:15.844970552 +0100
@@ -191,7 +191,7 @@ set(SRCS Src/ActionReplay.cpp
Src/PowerPC/JitCommon/JitCache.cpp
Src/PowerPC/JitCommon/Jit_Util.cpp)
-set(LIBS bdisasm inputcommon videoogl videosoftware sfml-network)
+set(LIBS bdisasm inputcommon videoogl videosoftware sfml-network-1.6)
if(WIN32)
set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp
diff -up dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt~ dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt
--- dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt~ 2013-02-20 00:38:35.000000000 +0100
+++ dolphin-emu-3.5/Source/Core/DolphinWX/CMakeLists.txt 2013-11-18 12:14:11.445091807 +0100
@@ -6,7 +6,7 @@ set(LIBS core
common
audiocommon
z
- sfml-network
+ sfml-network-1.6
${GTK2_LIBRARIES}
${OPENGL_LIBRARIES}
${XRANDR_LIBRARIES}
Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/devel/dolphin-emu.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dolphin-emu.spec 27 Jul 2013 14:19:26 -0000 1.5
+++ dolphin-emu.spec 18 Nov 2013 13:09:02 -0000 1.6
@@ -1,6 +1,6 @@
Name: dolphin-emu
Version: 3.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Gamecube / Wii / Triforce Emulator
Url: http://www.dolphin-emulator.com/
@@ -19,6 +19,8 @@
Patch0: %{name}-%{version}-clrun.patch
#Allows for building with wxwidget 2.8.12, rather than 2.9.3
Patch1: %{name}-%{version}-wx28.patch
+#Kudos to Hans de Goede (updates paths for compat-SFML16-devel):
+Patch2: %{name}-%{version}-compat-SFML16.patch
# Dolphin only runs on Intel x86 archictures
ExclusiveArch: i686 x86_64
@@ -58,8 +60,9 @@
%prep
%setup -q -a 1
-%patch0 -p1 -b .clrun
-%patch1 -p1 -b .wx28
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
#Patch for GCC 4.8
sed -i 's/_rot/__rot/g' Externals/Bochs_disasm/PowerPCDisasm.cpp Externals/wxWidgets3/include/wx/image.h Externals/wxWidgets3/src/generic/graphicc.cpp Externals/wxWidgets3/src/common/cairo.cpp Externals/wxWidgets3/src/common/image.cpp Externals/wxWidgets3/src/gtk/gnome/gprint.cpp Externals/wxWidgets3/src/gtk/dcclient.cpp Externals/wxWidgets3/src/gtk/print.cpp Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp Source/Core/Core/Src/ARDecrypt.cpp Source/Core/Common/Src/CommonFuncs.h Source/Core/Common/Src/Hash.cpp
@@ -126,6 +129,9 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Nov 18 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-5
+- Added patch for SFML, thanks to Hans de Goede
+
* Sat Jul 27 2013 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.5-4
- Updated for SFML 2.0 update
10 years, 5 months