[Piglit] [PATCH 01/14] cmake: Remove references to PNG

groleo at gmail.com groleo at gmail.com
Fri Nov 16 04:46:46 PST 2012


From: Adrian Marius Negreanu <adrian.m.negreanu at intel.com>

I haven't found any place where libpng is used.
In this case, it's safe to remove it altogether

Signed-off-by: Adrian Marius Negreanu <adrian.m.negreanu at intel.com>
---
 CMakeLists.txt |  3 +--
 README         | 11 ++---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f4c213..82f9ba8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,6 @@ project (piglit)
 
 find_package(TIFF)
 find_package(GLUT REQUIRED)
-find_package(PNG REQUIRED)
 find_package(X11)
 
 
@@ -79,7 +78,7 @@ IF(PIGLIT_BUILD_GLX_TESTS)
 ENDIF()
 
 # The 'REQUIRED' above correctly produces an error for
-# OpenGL and PNG, but there's a bug involving FindGLUT.cmake
+# OpenGL, but there's a bug involving FindGLUT.cmake
 # that fails to produce the error as of CMake 2.8.5.
 #
 # Instead, CMake keeps going and eventually spams
diff --git a/README b/README
index c114023..d9e6d73 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ First of all, you need to make sure that the following are installed:
   - cmake (http://www.cmake.org)
   - GL, glu and glut libraries and development packages (i.e. headers)
   - X11 libraries and development packages (i.e. headers)
-  - libpng, libtiff and related development packages (i.e. headers)
+  - libtiff and related development packages (i.e. headers)
   - waffle (http://people.freedesktop.org/~chadversary/waffle)
 
 Now configure the build system:
@@ -62,7 +62,7 @@ invoke cmake with option "-DCMAKE_SYSTEM_PROCESSOR=i386".
 ----------
 
 Install development packages.
-  $ sudo apt-get install cmake g++ mesa-common-dev libgl1-mesa-dev libtiff4-dev zlib1g-dev libpng12-dev python-numpy freeglut3-dev x11proto-gl-dev libxrender-dev
+  $ sudo apt-get install cmake g++ mesa-common-dev libgl1-mesa-dev libtiff4-dev zlib1g-dev python-numpy freeglut3-dev x11proto-gl-dev libxrender-dev
 
 Install additional components for which Ubuntu packages do not yet exist:
   - waffle (http://people.freedesktop.org/~chadversary/waffle)
@@ -116,8 +116,6 @@ Install development packages.
   - make
   - opengl
   - libGL-devel
-  - libpng12-devel
-  - libpng14-devel
   - zlib-devel
   - libtiff-devel
   - python
@@ -152,9 +150,6 @@ http://gnuwin32.sourceforge.net/packages/tiff.htm
 Install Zlib for Windows.
 http://gnuwin32.sourceforge.net/packages/zlib.htm
 
-Install LibPng for Windows.
-http://gnuwin32.sourceforge.net/packages/libpng.htm
-
 Download OpenGL Core API and Extension Header Files.
 http://www.opengl.org/registry/#headers
 Copy header files to MSVC.
@@ -177,8 +172,6 @@ Set these variables in the Advanced view.
   - TIFF_LIBRARY
   - ZLIB_INCLUDE_DIR
   - ZLIB_LIBRARY
-  - PNG_PNG_INCLUDE_DIR
-  - PNG_LIBRARY
   - GLUT_INCLUDE_DIR
   - GLUT_glut_LIBRARY
 Configure
-- 
1.8.0



More information about the Piglit mailing list