[MPlayer-cvslog] r36334 - trunk/libvo/gl_common.c

[Reimar Döffinger]

Guillaume POIRIER <poirierg at gmail.com> wrote:

>Hello,
>
>This commit broke compilation on OSX 10.7.5:
>
>Undefined symbols for architecture x86_64:
>  "_new_gpu_program", referenced from:
>      _glSetupYUVConversion in gl_common.o
>ld: symbol(s) not found for architecture x86_64
>clang: error: linker command failed with exit code 1 (use -v to see
>invocation)
>
>I think that the problem comes from:
>
>2013/6/11 reimar <subversion at mplayerhq.hu>:
>> Author: reimar
>> Date: Tue Jun 11 22:48:43 2013
>> New Revision: 36334
>
>> @@ -1785,6 +1797,8 @@ void glSetupYUVConversion(gl_conversion_
>>        glSetupYUVFragprog(params);
>>        break;
>>      case YUV_CONVERSION_SL_PROGRAM:
>> +      if (!gpu_yuv_sl_program)
>> +        gpu_yuv_sl_program = new_gpu_program();
>>        update_yuv_frag_src(params);
>>        break;
>>      case YUV_CONVERSION_NONE:
>
>that hunk above.
>
>It fails because new_gpu_program() is #defined that way:
>
>#if defined(CONFIG_GL_EGL_X11) || defined(CONFIG_GL_EGL_ANDROID)
>static GLuint new_gpu_program(void) {
>
>Thoughts?

Just remove the #if, it's only there to avoid a warning.