Ticket #2016: configure.patch

configure

@@ -215 +215 @@
   --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]
   --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
   --enable-libopencv       enable video filtering via libopencv [no]
-  --enable-libopenjpeg     enable JPEG 2000 de/encoding via OpenJPEG [no]
+  --enable-libopenjp2      enable JPEG 2000 de/encoding via OpenJPEG2 [no]
   --enable-libopus         enable Opus decoding via libopus [no]
   --enable-libpulse        enable Pulseaudio input via libpulse [no]
   --enable-libquvi         enable quvi input via libquvi [no]
@@ -1180 +1180 @@
     libopencore_amrnb
     libopencore_amrwb
     libopencv
-    libopenjpeg
+    libopenjp2
     libopus
     libpulse
     libquvi
@@ -1490 +1490 @@
     mprotect
     msvcrt
     nanosleep
-    openjpeg_1_5_openjpeg_h
+    openjpeg_2_0_openjpeg_h
     PeekNamedPipe
     perl
     pod2man
@@ -1995 +1995 @@
 libopencore_amrnb_encoder_deps="libopencore_amrnb"
 libopencore_amrnb_encoder_select="audio_frame_queue"
 libopencore_amrwb_decoder_deps="libopencore_amrwb"
-libopenjpeg_decoder_deps="libopenjpeg"
-libopenjpeg_encoder_deps="libopenjpeg"
+libopenjpeg_decoder_deps="libopenjp2"
+libopenjpeg_encoder_deps="libopenjp2"
 libopus_decoder_deps="libopus"
 libopus_encoder_deps="libopus"
 libopus_encoder_select="audio_frame_queue"
@@ -4155 +4155 @@
 enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
 enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
 enabled libopencv         && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
-enabled libopenjpeg       && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg ||
-                               check_lib openjpeg.h opj_version -lopenjpeg ||
-                               die "ERROR: libopenjpeg not found"; }
+enabled libopenjp2        && { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 ||
+                               check_lib openjpeg.h opj_version -lopenjp2 ||
+                               die "ERROR: libopenjp2 not found"; }
 enabled libopus           && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
 enabled libpulse          && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
 enabled libquvi           && require_pkg_config libquvi quvi/quvi.h quvi_init