Fix jpeglib linking

indra/cmake/JPEG.cmake

@@ -9,9 +9,9 @@ add_library( ll::libjpeg INTERFACE IMPORTED )
 use_system_binary(libjpeg)
 use_prebuilt_binary(libjpeg-turbo)
 if (LINUX)
-  target_link_libraries( ll::libjpeg INTERFACE jpeg)
+  target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
 elseif (DARWIN)
-  target_link_libraries( ll::libjpeg INTERFACE jpeg)
+  target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a)
 elseif (WINDOWS)
     target_link_libraries( ll::libjpeg INTERFACE
       debug ${ARCH_PREBUILT_DIRS_DEBUG}/jpeg.lib

indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl

@@ -23,8 +23,7 @@
  * $/LicenseInfo$
  */
 
-uniform sampler2D       noiseMap;
-uniform sampler2D   normalMap;
+uniform sampler2D   noiseMap;
 uniform sampler2D   depthMap;
 
 uniform float ssao_radius;

indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl

@@ -50,7 +50,6 @@ SOFTWARE.
 
 uniform sampler2D   normalMap;
 uniform sampler2D   depthMap;
-uniform sampler2D emissiveRect;
 uniform sampler2D projectionMap; // rgba
 uniform sampler2D brdfLut;