Packman Build Service PMBS

Changes of Revision 7

ffmpeg-6.spec Changed

@@ -40,20 +40,8 @@
 %preamble_string libswscale-devel %comparator %conflicts_version \
 %nil
 
-%if 0%{?BUILD_ORIG}
 %bcond_without amf_sdk
 %bcond_without cuda_sdk
-%else
-# If software H264 is disabled, the hw driver must be as well:
-# HW drivers can fail to initialize, namely when the hardware is absent.
-# Browsers choose video formats on sites like youtube based on `ffmpeg
-# -codecs` rather than the success/failure status of libav* initialization.
-# This becomes a problem when a format only has a HW driver;
-# the browser thinks it can do H264 but never succeeds.
-%bcond_with    amf_sdk
-%bcond_with    cuda_sdk
-%endif
-
 %bcond_with    amrwb
 %bcond_with    fdk_aac_dlopen
 %bcond_with    opencore
@@ -282,22 +270,16 @@
 FFmpeg is a multimedia framework, able to decode, encode,
 transcode, mux, demux, stream, filter and play several formats
 that humans and machines have created.
-%if !0%{?BUILD_ORIG}
-
-This build of ffmpeg is limited in the number of codecs supported.
-%endif
 
 %package -n libavcodec60
 Summary:        FFmpeg codec library
 Group:          System/Libraries
 Requires:       libavutil58 = %version-%release
 Requires:       libswresample4 = %version-%release
-%if 0%{?BUILD_ORIG}
 Provides:       libavcodec-full = %version-%release
 # This can be (and is) required by packages like vlc-codecs -
 # do follow the shlib name to not get random lib providers
 Provides:       libavcodec60(unrestricted)
-%endif
 # For mozillas
 Provides:       libavcodec = %version-%release
 
@@ -305,10 +287,6 @@
 The libavcodec library provides a generic encoding/decoding framework
 and contains multiple decoders and encoders for audio, video and
 subtitle streams, and several bitstream filters.
-%if !0%{?BUILD_ORIG}
-
-This build of ffmpeg is limited in the number of codecs supported.
-%endif
 
 %package libavcodec-devel
 Summary:        Development files for FFmpeg's codec library
@@ -413,10 +391,6 @@
 and demultiplexing (muxing and demuxing) audio, video and subtitle
 streams. It encompasses multiple muxers and demuxers for multimedia
 container formats.
-%if !0%{?BUILD_ORIG}
-
-This build of ffmpeg is limited in the number of codecs supported.
-%endif
 
 %package libavformat-devel
 Summary:        Development files for FFmpeg's stream format library
@@ -686,19 +660,7 @@
 %else
 	--disable-libxvid \
 %endif
-%if !0%{?BUILD_ORIG}
-	--enable-muxers \
-	--enable-demuxers \
-	--disable-encoders \
-	--disable-decoders \
-	--disable-decoder=h264,hevc,vc1 \
-	--enable-encoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_encoders)" \
-	--enable-decoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_decoders)" \
-
-for i in H264 HEVC VC1; do
-	grep -q "#define CONFIG_${i}_DECODER 0" config_components.h
-done
-%endif
+	%nil
 
 cat config.h
 %make_build