cvs rm forgotten old patches, spotted by nigel@

This commit is contained in:
landry 2013-04-25 09:13:55 +00:00
parent 6e487896d9
commit 3d0e5cccf7
4 changed files with 0 additions and 95 deletions

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2010/06/18 12:53:38 espie Exp $
--- CMakeLists.txt.orig Fri Jun 18 14:05:49 2010
+++ CMakeLists.txt Fri Jun 18 14:05:59 2010
@@ -18,6 +18,7 @@ include(PhononMacros)
include(MacroLogFeature)
include(MacroOptionalFindPackage)
+include(FindIconv)
set(QT_MIN_VERSION 4.6.0)
find_package(Qt4 REQUIRED)

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-cmake_FindGObject_cmake,v 1.1.1.1 2010/06/18 12:53:38 espie Exp $
--- cmake/FindGObject.cmake.orig Fri Jun 18 14:16:09 2010
+++ cmake/FindGObject.cmake Fri Jun 18 14:16:20 2010
@@ -49,11 +49,7 @@ FIND_LIBRARY(_GLibs NAMES glib-2.0
${PKG_GOBJECT2_LIBRARY_DIRS}
)
-IF (WIN32)
SET (GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs})
-ELSE (WIN32)
-SET (GOBJECT_LIBRARIES ${PKG_GOBJECT2_LIBRARIES})
-ENDIF (WIN32)
IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
SET(GOBJECT_FOUND TRUE)

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-gstreamer_CMakeLists_txt,v 1.1.1.1 2010/06/18 12:53:38 espie Exp $
--- gstreamer/CMakeLists.txt.orig Fri Jun 18 14:08:15 2010
+++ gstreamer/CMakeLists.txt Fri Jun 18 14:08:46 2010
@@ -25,7 +25,8 @@ if (BUILD_PHONON_GSTREAMER)
${GSTREAMER_PLUGIN_PBUTILS_INCLUDE_DIR}
${GLIB2_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
- ${X11_X11_INCLUDE_PATH})
+ ${X11_X11_INCLUDE_PATH}
+ ${ICONV_INCLUDE_DIR})
add_definitions(-DPHONON_BACKEND_VERSION_4_2)
# configure plugin api

View File

@ -1,56 +0,0 @@
$OpenBSD: patch-xine_videowidget_h,v 1.1.1.1 2010/06/18 12:53:38 espie Exp $
--- xine/videowidget.h.orig Fri Jun 18 14:20:12 2010
+++ xine/videowidget.h Fri Jun 18 14:21:31 2010
@@ -28,9 +28,9 @@
#include <QPixmap>
#include <xine.h>
-//#ifndef PHONON_XINE_NO_VIDEOWIDGET
+#ifndef PHONON_XINE_NO_VIDEOWIDGET
#include <xcb/xcb.h>
-//#endif // PHONON_XINE_NO_VIDEOWIDGET
+#endif // PHONON_XINE_NO_VIDEOWIDGET
#include <phonon/VideoWidget>
#include <phonon/VideoWidgetInterface>
@@ -51,22 +51,22 @@ class XcbConnection : public QSharedData
public:
static QExplicitlySharedDataPointer<XcbConnection> instance();
~XcbConnection();
-//#ifndef PHONON_XINE_NO_VIDEOWIDGET
+#ifndef PHONON_XINE_NO_VIDEOWIDGET
operator xcb_connection_t *() const { return m_xcbConnection; }
xcb_screen_t *screen() const { return m_screen; }
operator bool() const { return m_xcbConnection; }
-//#else // PHONON_XINE_NO_VIDEOWIDGET
+#else // PHONON_XINE_NO_VIDEOWIDGET
//operator bool() const { return false; }
-//#endif // PHONON_XINE_NO_VIDEOWIDGET
+#endif // PHONON_XINE_NO_VIDEOWIDGET
private:
XcbConnection();
private:
-//#ifndef PHONON_XINE_NO_VIDEOWIDGET
+#ifndef PHONON_XINE_NO_VIDEOWIDGET
xcb_connection_t *m_xcbConnection;
xcb_screen_t *m_screen;
-//#endif // PHONON_XINE_NO_VIDEOWIDGET
+#endif // PHONON_XINE_NO_VIDEOWIDGET
};
class VideoWidgetXT : public SinkNodeXT
@@ -82,10 +82,10 @@ class VideoWidgetXT : public SinkNodeXT
void createVideoPort();
private:
-//#ifndef PHONON_XINE_NO_VIDEOWIDGET
+#ifndef PHONON_XINE_NO_VIDEOWIDGET
xcb_visual_t m_visual;
xcb_connection_t *m_xcbConnection;
-//#endif // PHONON_XINE_NO_VIDEOWIDGET
+#endif // PHONON_XINE_NO_VIDEOWIDGET
//QExplicitlySharedDataPointer<XcbConnection> m_xcbConnection;
xine_video_port_t *m_videoPort;
VideoWidget *m_videoWidget;