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

(-)b/graphics/osg/Makefile (-1 / +3 lines)
Lines 54-60 COLLADA_DESC= COLLADA (dae) format support Link Here
54 
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 54 
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
55 
CURL_VARS=		FORCE_REQUIRE+=CURL
 55 
CURL_VARS=		FORCE_REQUIRE+=CURL
56 
CURL_VARS_OFF=		FORCE_IGNORE+=CURL
 56 
CURL_VARS_OFF=		FORCE_IGNORE+=CURL
57 
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 57 
FFMPEG_LIB_DEPENDS=	libavcodec.so.58:multimedia/ffmpeg4
58 
FFMPEG_VARS=		FORCE_REQUIRE+=FFmpeg
 58 
FFMPEG_VARS=		FORCE_REQUIRE+=FFmpeg
59 
FFMPEG_VARS_OFF=	FORCE_IGNORE+=FFmpeg
 59 
FFMPEG_VARS_OFF=	FORCE_IGNORE+=FFmpeg
60 
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 60 
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
Lines 148-153 post-patch: Link Here
148 
		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'
 148 
		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'
149 
	@${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d; \
 149 
	@${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d; \
150 
		s|-pedantic||' ${WRKSRC}/CMakeLists.txt
 150 
		s|-pedantic||' ${WRKSRC}/CMakeLists.txt
151 
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
152 
		${PATCH_WRKSRC}/CMakeModules/FindFFmpeg.cmake
151 
.for p in ${FORCE_REQUIRE}
 153 
.for p in ${FORCE_REQUIRE}
152 
	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \
 154 
	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \
153 
		${WRKSRC}/CMakeLists.txt
 155 
		${WRKSRC}/CMakeLists.txt
(-)b/graphics/osg/files/patch-CMakeModules_FindFFmpeg.cmake (+10 lines)
Added Link Here
1 
--- CMakeModules/FindFFmpeg.cmake.orig	2023-04-24 09:16:25 UTC
2 
+++ CMakeModules/FindFFmpeg.cmake
3 
@@ -21,6 +21,7 @@
4 
 #                                                       (in new version case, use by ffmpeg header)
5 
 #and ${FFMPEG_libname_INCLUDE_DIRS/libname}             (in new version case, use by osg plugin code)
6
7 
+set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec")
8
9 
 # Macro to find header and lib directories
10 
 # example: FFMPEG_FIND(AVFORMAT avformat avformat.h)
(-)b/graphics/osg34/Makefile (-2 / +4 lines)
Lines 23-29 GH_PROJECT= OpenSceneGraph Link Here
23 

          23
          

        

        

          24
          
CONFLICTS_INSTALL=osg

          24
          
CONFLICTS_INSTALL=osg

        

        

          25
          

          25
          

        

          
            

              26
              
USES=		alias cmake compiler:c++11-lang gl jpeg pkgconfig xorg


              26
              
USES=		alias cmake compiler:c++11-lang gl jpeg localbase pkgconfig xorg

            

        

          27
          
USE_GL=		gl glu

          27
          
USE_GL=		gl glu

        

        

          28
          
USE_XORG=	x11

          28
          
USE_XORG=	x11

        

        

          29
          
USE_LDCONFIG=	yes

          29
          
USE_LDCONFIG=	yes

        

  

    
      
            Lines 54-60
          OPTIONS_SUB=	yes
      
      
        Link Here
      
    
  

        

          54
          
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl

          54
          
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl

        

        

          55
          
CURL_VARS=		FORCE_REQUIRE+=CURL

          55
          
CURL_VARS=		FORCE_REQUIRE+=CURL

        

        

          56
          
CURL_VARS_OFF=		FORCE_IGNORE+=CURL

          56
          
CURL_VARS_OFF=		FORCE_IGNORE+=CURL

        

          
            

              57
              
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg


              57
              
FFMPEG_LIB_DEPENDS=	libavcodec.so.58:multimedia/ffmpeg4

            

        

          58
          
FFMPEG_VARS=		FORCE_REQUIRE+=FFmpeg

          58
          
FFMPEG_VARS=		FORCE_REQUIRE+=FFmpeg

        

        

          59
          
FFMPEG_VARS_OFF=	FORCE_IGNORE+=FFmpeg

          59
          
FFMPEG_VARS_OFF=	FORCE_IGNORE+=FFmpeg

        

        

          60
          
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2

          60
          
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2

        

  

    
      
            Lines 138-143
          post-patch:
      
      
        Link Here
      
    
  

        

          138
          
		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'

          138
          
		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'

        

        

          139
          
	@${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d' \

          139
          
	@${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d' \

        

        

          140
          
		${WRKSRC}/CMakeLists.txt

          140
          
		${WRKSRC}/CMakeLists.txt

        

            

              
              
              141
              
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \

            

            

              142
              
		${PATCH_WRKSRC}/CMakeModules/FindFFmpeg.cmake

            

        

          141
          
.for p in ${FORCE_REQUIRE}

          143
          
.for p in ${FORCE_REQUIRE}

        

        

          142
          
	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \

          144
          
	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \

        

        

          143
          
		${WRKSRC}/CMakeLists.txt

          145
          
		${WRKSRC}/CMakeLists.txt

        



(-)b/graphics/osg34/files/patch-CMakeModules_FindFFmpeg.cmake
      (+10 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
--- CMakeModules/FindFFmpeg.cmake.orig	2023-04-24 09:18:12 UTC

            

            

              2
              
+++ CMakeModules/FindFFmpeg.cmake

            

            

              3
              
@@ -21,6 +21,7 @@

            

            

              4
              
 #                                                       (in new version case, use by ffmpeg header) 

            

            

              5
              
 #and ${FFMPEG_libname_INCLUDE_DIRS/libname}             (in new version case, use by osg plugin code)

            

            

              6
              
 

            

            

              7
              
+set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec")

            

            

              8
              
 

            

            

              9
              
 # Macro to find header and lib directories

            

            

              10
              
 # example: FFMPEG_FIND(AVFORMAT avformat avformat.h)

            






  

  Return to bug 270207