[nox11] Disable videoep plugin for now

rpm/disable-x11-configure-checks.patch

@@ -0,0 +1,28 @@
+From 0aa8a9d132e611dda998a064c30771b1225170b4 Mon Sep 17 00:00:00 2001
+From: Mohammed Sameer <msameer@foolab.org>
+Date: Mon, 25 Nov 2013 13:44:11 +0200
+Subject: [PATCH] disable x11 configure checks
+
+---
+ configure.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 2481c96..a9872d4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -71,9 +71,9 @@ else
+ fi
+
+ # Check for xlib (videoep)
+-PKG_CHECK_MODULES(X11, x11)
+-AC_SUBST(X11_CFLAGS)
+-AC_SUBST(X11_LIBS)
++dnl PKG_CHECK_MODULES(X11, x11)
++dnl AC_SUBST(X11_CFLAGS)
++dnl AC_SUBST(X11_LIBS)
+
+ # Checks for glib and gobject.
+ PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0)
+-- 
+1.8.4.rc3

rpm/ohm-plugins-misc.spec

@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.26
+# Generated by: spectacle version 0.27
 # 
 
 Name:       ohm-plugins-misc
@@ -20,19 +20,18 @@ Source2:    ohm-session-agent.conf
 Source100:  ohm-plugins-misc.yaml
 Patch0:     disable-cgroups-plugin.patch
 Patch1:     disable-upstart-plugin.patch
+Patch2:     disable-x11-configure-checks.patch
 Requires:   ohm
 Requires:   systemd
 Requires:   systemd-user-session-targets
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(x11-xcb)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(check)
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(libresource)
 BuildRequires:  pkgconfig(ohm)
 BuildRequires:  pkgconfig(libdres)
-BuildRequires:  pkgconfig(videoipc)
 BuildRequires:  pkgconfig(profile)
 BuildRequires:  bison
 BuildRequires:  flex
@@ -48,19 +47,6 @@ Group:      Development/Tools
 OHM console plugin for debug interface.
 
 
-%package -n ohm-plugin-videoep
-Summary:    Video enforcement point for OHM
-Group:      System/Resource Policy
-Requires:   %{name} = %{version}-%{release}
-Requires:   ohm
-Requires:   ohm-plugin-signaling
-Requires:   xserver-policy-enforcement
-
-%description -n ohm-plugin-videoep
-OHM videoep plugin provides policy enforcement point for |
-video.
-
-
 %package -n ohm-plugin-fmradio
 Summary:    FM radio enforcement point for OHM
 Group:      System/Resource Policy
@@ -152,6 +138,8 @@ OHM profile plugin provides functionality to detect profile changes.
 %patch0 -p1
 # disable-upstart-plugin.patch
 %patch1 -p1
+# disable-x11-configure-checks.patch
+%patch2 -p1
 # >> setup
 # << setup
 
@@ -162,12 +150,12 @@ OHM profile plugin provides functionality to detect profile changes.
 %autogen --disable-static
 %configure --disable-static \
     --enable-telephony \
-    --enable-videoep \
     --disable-notification
 
 make
 
 # >> build post
+#--enable-videoep \
 # << build post
 
 %install
@@ -233,13 +221,6 @@ fi
 %doc COPYING AUTHORS
 # << files ohm-plugin-console
 
-%files -n ohm-plugin-videoep
-%defattr(-,root,root,-)
-# >> files ohm-plugin-videoep
-%{_libdir}/ohm/libohm_videoep.so
-%config %{_sysconfdir}/ohm/plugins.d/videoep.ini
-# << files ohm-plugin-videoep
-
 %files -n ohm-plugin-fmradio
 %defattr(-,root,root,-)
 # >> files ohm-plugin-fmradio

rpm/ohm-plugins-misc.yaml

@@ -14,6 +14,7 @@ Description: A miscallaneous set of OHM plugins by Nokia.
 Patches:
     - disable-cgroups-plugin.patch
     - disable-upstart-plugin.patch
+    - disable-x11-configure-checks.patch
 
 Requires:
     - ohm
@@ -24,20 +25,20 @@ PkgBR:
     - flex
 PkgConfigBR:
     - glib-2.0
-    - x11-xcb
+    #- x11-xcb
     - dbus-glib-1
     - check
     - gconf-2.0
     - bluez
     - libresource
     - ohm
     - libdres
-    - videoipc
+    #- videoipc
     - profile
 Configure: autogen
 ConfigOptions:
     - --enable-telephony
-    - --enable-videoep
+    #- --enable-videoep
     - --disable-notification      # for now (excluded from basic ruleset)
 Builder: single-make
 SubPackages:
@@ -48,17 +49,17 @@ SubPackages:
       Description: |
             OHM console plugin for debug interface.
       AutoDepend: no
-    - Name: ohm-plugin-videoep
-      AsWholeName: yes
-      Group: System/Resource Policy
-      Summary: Video enforcement point for OHM
-      Description: |
-            OHM videoep plugin provides policy enforcement point for |
-            video.
-      Requires:
-          - ohm
-          - ohm-plugin-signaling
-          - xserver-policy-enforcement
+    #- Name: ohm-plugin-videoep
+    #  AsWholeName: yes
+    #  Group: System/Resource Policy
+    #  Summary: Video enforcement point for OHM
+    #  Description: |
+    #        OHM videoep plugin provides policy enforcement point for |
+    #        video.
+    #  Requires:
+    #      - ohm
+    #      - ohm-plugin-signaling
+    #      - xserver-policy-enforcement
     - Name: ohm-plugin-fmradio
       AsWholeName: yes
       Group: System/Resource Policy