linux-zzogl: don't build anymore zzogl by default

Sadly, no time to maintain it neither to improve it.

Note: I think new openGL 4.x feature would make the plugin faster

Anyway, now GSdx-ogl is probably better than zzogl

cmake/SelectPcsx2Plugins.cmake

@@ -186,14 +186,16 @@ endif()
 #			-JPEG
 #           -common_libs
 #---------------------------------------
-if((GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND JPEG_FOUND AND common_libs AND GTKn_FOUND) AND (CG_FOUND OR GLSL_API))
+if(EXTRA_PLUGINS)
+    if((GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND JPEG_FOUND AND common_libs AND GTKn_FOUND) AND (CG_FOUND OR GLSL_API))
         set(zzogl TRUE)
-elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/zzogl-pg")
+    elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/zzogl-pg")
         set(zzogl FALSE)
-else()
+    else()
         set(zzogl FALSE)
         message(STATUS "Skip build of zzogl: miss some dependencies")
         message(STATUS "${msg_dep_zzogl}")
+    endif()
 endif()
 #---------------------------------------
 

debian-packager/README.Debian

@@ -13,35 +13,19 @@ Package information for PCSX2
 Information about the plug-ins for video
 ------------------------------------------
 
- * The zzogl plug-in comes in two flavors:
+ * GSdx plug-in currently require a video card that supports
-   - The Nvidia Cg version which requires the non-free nvidia-cg-toolkit
-     package. Since this package contains GPL-2+ code this plug-in can't be
-     distributed without an GPL exception allowing linking with non-free
-     libraries. If the user desires to try this flavor of the plug-in he/she
-     must:
-     + Install the nvidia-cg-dev or nvidia-cg-toolkit package from non-free.
-     + Pass "-DGLSL_API=FALSE" to dh_auto_configure in the rules file.
-     + Add "usr/lib/*/games/pcsx2/*.dat /usr/share/games/pcsx2/" to the install
-       file.
-     + Compile the program using dpkg-buildpackage.
-     This plug-in currently provides the greatest compatibility with video cards
-     and drivers. It currently works with open source drivers like radeon R600.
-   - The OpenGL Shading Language (GLSL 4.2) version which currently only works with
-     AMD video cards but support for other cards is being worked on.
-
- * The GSdx and zzogl GLSL plug-ins currently require a video card that supports
    at least OpenGL 3.3. A noninclusive list of cards that support OpenGL 3.0 is:
    - Radeon HD series (except HD2300)
    - GeForce 8, 9, 100-series, 200-series, 300-series, 400-series and 500-series
    - Intel Sandy Bridge HD Graphics 2000 and up
 
  * Currently the proprietary drivers for AMD and Nvidia have support for
-   OpenGL 3.0 and above. The GSdx and/or zzogl GLSL plug-ins use the following
+   OpenGL 3.0 and above. GSdx plug-in use the following
    extensions/commands that may or may not be completely implemented in the
    open source video stack:
    - OpenGL 3.x (supported on Mesa 10.x)
    - OpenGL 4.0
-     + GL_ARB_GPU_shader5 (GSdx, improve FXAA, optional)
+     + GL_ARB_GPU_shader5 (improve FXAA, optional)
    - OpenGL 4.1
      + GL_ARB_separate_shader_objects
    - OpenGL 4.2
@@ -52,7 +36,7 @@ Information about the plug-ins for video
    - OpenGL 4.3
      + GL_ARB_explicit_uniform_location
      + GL_ARB_framebuffer_no_attachments
-     + GL_ARB_copy_image (GSdx, optional)
+     + GL_ARB_copy_image (optional)
    - OpenGL 4.4
      + GL_ARB_buffer_storage
    - OpenGL 4.5

debian-packager/control

@@ -1,5 +1,5 @@
 Source: pcsx2.snapshot
-Section: contrib/games
+Section: games
 Priority: optional
 Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
 Build-Depends: cmake (>= 2.8.5),
@@ -12,7 +12,6 @@ Build-Depends: cmake (>= 2.8.5),
     libglew-dev,
     libglu1-mesa-dev,
     libgtk2.0-dev (>= 2.16),
-    libjpeg-dev,
     libpulse-dev,
     libsdl1.2-dev,
     libsoundtouch-dev,
@@ -20,8 +19,6 @@ Build-Depends: cmake (>= 2.8.5),
     libwxgtk2.8-dev,
     libx11-dev,
     locales | locales-all,
-# Future: depends on "nvidia-cg-dev" directly
-    libcg, nvidia-cg-toolkit (>= 3),
     portaudio19-dev,
     zlib1g-dev (>= 1:1.2.3.3)
 Standards-Version: 3.9.3
@@ -50,7 +47,7 @@ Description: Playstation 2 emulator
  anyway.
 
 Package: pcsx2-unstable-dbg
-Section: contrib/debug
+Section: debug
 Priority: extra
 Architecture: i386
 Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version})