Attachment #8800624: Part 5. Add --with-system-webp switch to build. v4 for bug #1294490

View | Details | Raw Unified | Return to bug 1294490
Collapse All | Expand All

(-)a/config/external/moz.build (-1 / +2 lines)
Line     Link Here 
 Lines 31-47   if CONFIG['MOZ_WEBM_ENCODER']: Link Here 
31 
    external_dirs += ['media/libmkv']
 31 
    external_dirs += ['media/libmkv']
32 

          32
          

        

        

          33
          
if not CONFIG['MOZ_SYSTEM_LIBVPX']:

          33
          
if not CONFIG['MOZ_SYSTEM_LIBVPX']:

        

        

          34
          
    external_dirs += ['media/libvpx']

          34
          
    external_dirs += ['media/libvpx']

        

        

          35
          

          35
          

        

        

          36
          
if not CONFIG['MOZ_SYSTEM_PNG']:

          36
          
if not CONFIG['MOZ_SYSTEM_PNG']:

        

        

          37
          
    external_dirs += ['media/libpng']

          37
          
    external_dirs += ['media/libpng']

        

        

          38
          

          38
          

        

          
            

              39
              
external_dirs += ['media/libwebp']


              39
              
if not CONFIG['MOZ_SYSTEM_WEBP']:

            

            

              
              

              40
              
    external_dirs += ['media/libwebp']

            

        

          40
          

          41
          

        

        

          41
          
if CONFIG['CPU_ARCH'] == 'arm':

          42
          
if CONFIG['CPU_ARCH'] == 'arm':

        

        

          42
          
    external_dirs += ['media/openmax_dl']

          43
          
    external_dirs += ['media/openmax_dl']

        

        

          43
          

          44
          

        

        

          44
          
if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:

          45
          
if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:

        

        

          45
          
    external_dirs += [

          46
          
    external_dirs += [

        

        

          46
          
        'media/sphinxbase',

          47
          
        'media/sphinxbase',

        

        

          47
          
        'media/pocketsphinx',

          48
          
        'media/pocketsphinx',

        



(-)a/config/system-headers
      (+6 lines)




  

    

    

      Line 
      
    
  Link Here 
    

  

  

    

    

       Lines 1249-1264
      zmouse.h
    
  Link Here 
    

  

        

          1249
          
soundtouch/SoundTouch.h

          1249
          
soundtouch/SoundTouch.h

        

        

          1250
          
soundtouch/SoundTouchFactory.h

          1250
          
soundtouch/SoundTouchFactory.h

        

        

          1251
          
#if MOZ_LIBAV_FFT==1

          1251
          
#if MOZ_LIBAV_FFT==1

        

        

          1252
          
libavcodec/avfft.h

          1252
          
libavcodec/avfft.h

        

        

          1253
          
#endif

          1253
          
#endif

        

        

          1254
          
#if MOZ_SYSTEM_PNG==1

          1254
          
#if MOZ_SYSTEM_PNG==1

        

        

          1255
          
png.h

          1255
          
png.h

        

        

          1256
          
#endif

          1256
          
#endif

        

            

              
              
              1257
              
#if MOZ_SYSTEM_WEBP==1

            

            

              1258
              
webp/decode.h

            

            

              1259
              
webp/demux.h

            

            

              1260
              
webp/mux_types.h

            

            

              1261
              
webp/types.h

            

            

              1262
              
#endif

            

        

          1257
          
#if MOZ_SYSTEM_ZLIB==1

          1263
          
#if MOZ_SYSTEM_ZLIB==1

        

        

          1258
          
zlib.h

          1264
          
zlib.h

        

        

          1259
          
#endif

          1265
          
#endif

        

        

          1260
          
#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION

          1266
          
#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION

        

        

          1261
          
libsn/sn.h

          1267
          
libsn/sn.h

        

        

          1262
          
libsn/sn-common.h

          1268
          
libsn/sn-common.h

        

        

          1263
          
libsn/sn-launchee.h

          1269
          
libsn/sn-launchee.h

        

        

          1264
          
libsn/sn-launcher.h

          1270
          
libsn/sn-launcher.h

        



(-)a/toolkit/library/moz.build
      (+4 lines)




  

    

    

      Line 
      
    
  Link Here 
    

  

  

    

    

       Lines 227-242
      if CONFIG['SERVO_TARGET_DIR']:
    
  Link Here 
    

  

        

          227
          
        OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']

          227
          
        OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']

        

        

          228
          

          228
          

        

        

          229
          
if CONFIG['MOZ_SYSTEM_JPEG']:

          229
          
if CONFIG['MOZ_SYSTEM_JPEG']:

        

        

          230
          
    OS_LIBS += CONFIG['MOZ_JPEG_LIBS']

          230
          
    OS_LIBS += CONFIG['MOZ_JPEG_LIBS']

        

        

          231
          

          231
          

        

        

          232
          
if CONFIG['MOZ_SYSTEM_PNG']:

          232
          
if CONFIG['MOZ_SYSTEM_PNG']:

        

        

          233
          
    OS_LIBS += CONFIG['MOZ_PNG_LIBS']

          233
          
    OS_LIBS += CONFIG['MOZ_PNG_LIBS']

        

        

          234
          

          234
          

        

            

              
              
              235
              
if CONFIG['MOZ_SYSTEM_WEBP']:

            

            

              236
              
    OS_LIBS += CONFIG['MOZ_WEBP_LIBS']

            

            

              237
              
    OS_LIBS += CONFIG['MOZ_WEBPDEMUX_LIBS']

            

            

              238
              

            

        

          235
          
if CONFIG['MOZ_SYSTEM_HUNSPELL']:

          239
          
if CONFIG['MOZ_SYSTEM_HUNSPELL']:

        

        

          236
          
    OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']

          240
          
    OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']

        

        

          237
          

          241
          

        

        

          238
          
if CONFIG['MOZ_SYSTEM_LIBEVENT']:

          242
          
if CONFIG['MOZ_SYSTEM_LIBEVENT']:

        

        

          239
          
    OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']

          243
          
    OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']

        

        

          240
          

          244
          

        

        

          241
          
if CONFIG['MOZ_SYSTEM_LIBVPX']:

          245
          
if CONFIG['MOZ_SYSTEM_LIBVPX']:

        

        

          242
          
    OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']

          246
          
    OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']

        



(-)a/toolkit/moz.configure
      (+10 lines)




  

    

    

      Line 
      
    
  Link Here 
    

  

  

    

    

       Lines 759-774
      def skia_includes(skia, skia_gpu):
    
  Link Here 
    

  

        

          759
          
            '/gfx/skia/skia/include/gpu',

          759
          
            '/gfx/skia/skia/include/gpu',

        

        

          760
          
            '/gfx/skia/skia/include/utils',

          760
          
            '/gfx/skia/skia/include/utils',

        

        

          761
          
        ]

          761
          
        ]

        

        

          762
          

          762
          

        

        

          763
          
    return includes

          763
          
    return includes

        

        

          764
          

          764
          

        

        

          765
          
set_config('SKIA_INCLUDES', skia_includes)

          765
          
set_config('SKIA_INCLUDES', skia_includes)

        

        

          766
          

          766
          

        

            

              
              
              767
              
option('--with-system-webp',

            

            

              768
              
       help='Use system libwebp (located with pkgconfig)')

            

            

              769
              

            

            

              770
              
use_system_webp = depends_if('--with-system-webp')(lambda _: True)

            

            

              771
              

            

            

              772
              
system_webp = pkg_check_modules('MOZ_WEBP', 'libwebp >= 0.5.1 libwebpdemux >= 0.5.1',

            

            

              773
              
                                when=use_system_webp)

            

            

              774
              

            

            

              775
              
set_config('MOZ_SYSTEM_WEBP', system_webp)

            

            

              776
              

            

        

          767
          
# Support various fuzzing options

          777
          
# Support various fuzzing options

        

        

          768
          
# ==============================================================

          778
          
# ==============================================================

        

        

          769
          
option('--enable-libfuzzer', help='Enable libfuzzer support')

          779
          
option('--enable-libfuzzer', help='Enable libfuzzer support')

        

        

          770
          

          780
          

        

        

          771
          
@depends('--enable-libfuzzer')

          781
          
@depends('--enable-libfuzzer')

        

        

          772
          
def enable_libfuzzer(value):

          782
          
def enable_libfuzzer(value):

        

        

          773
          
    if value:

          783
          
    if value:

        

        

          774
          
        return True

          784
          
        return True

        







  


  Return to bug 1294490