Attachment #241894 for bug #270569

Lines 46-51 USES+= iconv pkgconfig Link Here

(-)b/multimedia/mplayer/Makefile (+2 lines)
46		46
47	OPTIONS_SUB= yes	47	OPTIONS_SUB= yes
48		48
		49	CFLAGS+= -I${LOCALBASE}/ffmpeg4/include
		50
49	.include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars"	51	.include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars"
50	.include <bsd.port.pre.mk>	52	.include <bsd.port.pre.mk>
51		53

Lines 5-11 Link Here

(-)b/multimedia/mplayer/files/patch-Makefile (-1 / +1 lines)
5	codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML	5	codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
6	codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h	6	codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
7	- $(HOST_CC) $(HOSTCFLAGS) -o $@ $<	7	- $(HOST_CC) $(HOSTCFLAGS) -o $@ $<
8	+ $(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/ffmpeg4/include -o $@ $<	8	+ $(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/include -o $@ $<
9		9
10	codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf	10	codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
11	./$^ > $@	11	./$^ > $@




--- configure.orig	2023-02-20 22:41:00 UTC
+++ configure
@@ -666,7 +666,7 @@ armthumb=auto
 _iwmmxt=auto
 _mtrr=auto
 _altivec=auto

 _ranlib=ranlib
 _windres=windres
 _cc=cc
@@ -1019,7 +1019,7 @@ for ac_option do
     ld_static=''
     ;;
   --enable-profile)

     ;;
   --disable-profile)
     _profile=
@@ -1491,7 +1491,6 @@ for ac_option do
 
   *)
     echo "Unknown parameter: $ac_option"

     ;;
 
   esac
@@ -1529,40 +1528,6 @@ rm -f "$TMPLOG"
 echo configuration: $configuration > "$TMPLOG"
 echo >> "$TMPLOG"
 

 list_subparts() {
   test ! -e ffmpeg/libav${3} && return 1
   pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
@@ -1844,7 +1809,7 @@ if test -z "$_target" ; then
   case "$1" in
       x86_64|amd64|x64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
       ia64) host_arch=ia64 ;;

       alpha) host_arch=alpha ;;
       sun4*|sparc*) host_arch=sparc ;;
       parisc*|hppa*|9000*) host_arch=hppa ;;
@@ -1970,7 +1935,11 @@ echocheck "working compiler"
 cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
 echo "yes"
 

 
 if test -z "$_target" ; then
   cat > $TMPC << EOF
@@ -3100,7 +3069,7 @@ if x86_32 ; then
     _pref_as_version='2.16.92'
     echo 'pabsd %xmm0, %xmm1' >> $TMPS
   fi

 
   if test "$as_verc_fail" != yes ; then
     echores "ok"
@@ -3367,6 +3336,13 @@ if arm ; then
   fi
   echores "$setend"
 

   echocheck "softfloat ABI"
   softfloat=yes
   cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
@@ -4277,7 +4253,7 @@ echocheck "pthread"
 if linux ; then
   THREAD_CFLAGS=-D_REENTRANT
 elif freebsd || netbsd || openbsd || bsdos ; then

 fi
 if test "$_pthreads" = auto ; then
 cat > $TMPC << EOF
@@ -4287,7 +4263,7 @@ int main(void) { pthread_t tid; return pthread_create(
 EOF
 _pthreads=no
 if ! hpux ; then

     # for crosscompilation, we cannot execute the program, be happy if we can link statically
     cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
   done
@@ -4430,7 +4406,7 @@ int main(void) {
 }
 EOF
   _iconv=no

     cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
       ld_iconv="$ld_tmp" && _iconv=yes && break
   done
@@ -4460,7 +4436,7 @@ if test "$_termcap" = auto ; then
   _termcap=no
   for ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do
     statement_check term.h 'tgetent(0, 0)' $ld_tmp &&
-      extra_ldflags="$extra_ldflags $ld_tmp" &&
+      extra_ldflags="-L%%LOCALBASE%%/ffmpeg4/lib $extra_ldflags $ld_tmp" &&
       ld_termcap="$ld_tmp" && _termcap=yes && break
   done
 fi
@@ -5876,15 +5852,6 @@ EOF
       break
     fi
   done

   if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
     _gl=yes
     _gl_win32=yes
@@ -6419,7 +6386,7 @@ elif darwin ; then
 elif dragonfly ; then
   default_cdrom_device="/dev/cd0"
 elif freebsd ; then

 elif openbsd ; then
   default_cdrom_device="/dev/rcd0c"
 elif sunos ; then
@@ -6432,7 +6399,7 @@ else
   default_cdrom_device="/dev/cdrom"
 fi
 

   default_dvd_device=$default_cdrom_device
 elif darwin ; then
   default_dvd_device="/dev/rdiskN"
@@ -6959,7 +6926,7 @@ echores "$_speex"
 echocheck "libgsm"
 if test "$_libgsm" = auto ; then
   _libgsm=no

 fi
 if test "$_libgsm" = yes ; then
   def_libgsm='#define CONFIG_LIBGSM 1'
@@ -7391,6 +7358,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
   nolibrtmp=no
   def_librtmp='#define CONFIG_LIBRTMP 1'
   inputmodules="librtmp $inputmodules"

 else
   nolibrtmp=yes
   _librtmp=no
@@ -7808,7 +7785,7 @@ echores "$_mp3lame"
 echocheck "mencoder"
 if test "$_mencoder" = no ; then
   # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,

 fi
 echores "$_mencoder"
 
@@ -8414,7 +8391,7 @@ libs_mplayer=$ld_tmp
 
 #############################################################################
 
-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=c++98"
 

Return to bug 270569

Lines 1-6 Link Here

(-)b/multimedia/mplayer/files/patch-configure (-20 / +29 lines)
1	--- configure.orig 2021-03-05 12:28:06 UTC	1	--- configure.orig 2023-02-20 22:41:00 UTC
2	+++ configure	2	+++ configure
3	@@ -664,7 +664,7 @@ armthumb=auto	3	@@ -666,7 +666,7 @@ armthumb=auto
4	_iwmmxt=auto	4	_iwmmxt=auto
5	_mtrr=auto	5	_mtrr=auto
6	_altivec=auto	6	_altivec=auto
Lines 9-15 Link Here
9	_ranlib=ranlib	9	_ranlib=ranlib
10	_windres=windres	10	_windres=windres
11	_cc=cc	11	_cc=cc
12	@@ -1016,7 +1016,7 @@ for ac_option do	12	@@ -1019,7 +1019,7 @@ for ac_option do
13	ld_static=''	13	ld_static=''
14	;;	14	;;
15	--enable-profile)	15	--enable-profile)
Lines 18-24 Link Here
18	;;	18	;;
19	--disable-profile)	19	--disable-profile)
20	_profile=	20	_profile=
21	@@ -1486,7 +1486,6 @@ for ac_option do	21	@@ -1491,7 +1491,6 @@ for ac_option do
22		22
23	*)	23	*)
24	echo "Unknown parameter: $ac_option"	24	echo "Unknown parameter: $ac_option"
Lines 26-32 Link Here
26	;;	26	;;
27		27
28	esac	28	esac
29	@@ -1524,40 +1523,6 @@ rm -f "$TMPLOG"	29	@@ -1529,40 +1528,6 @@ rm -f "$TMPLOG"
30	echo configuration: $configuration > "$TMPLOG"	30	echo configuration: $configuration > "$TMPLOG"
31	echo >> "$TMPLOG"	31	echo >> "$TMPLOG"
32		32
Lines 67-73 Link Here
67	list_subparts() {	67	list_subparts() {
68	test ! -e ffmpeg/libav${3} && return 1	68	test ! -e ffmpeg/libav${3} && return 1
69	pattern="s/^[^#]${1}.([^ ,], \([^ ,)]\)./\1_${2}/p"	69	pattern="s/^[^#]${1}.([^ ,], \([^ ,)]\)./\1_${2}/p"
70	@@ -1836,7 +1801,7 @@ if test -z "$_target" ; then	70	@@ -1844,7 +1809,7 @@ if test -z "$_target" ; then
71	case "$1" in	71	case "$1" in
72	x86_64\|amd64\|x64\|i[3-9]86\|i86pc\|x86\|x86pc\|k5\|k6\|k6_2\|k6_3\|k6-2\|k6-3\|pentium\|athlon*\|i586_i686\|i586-i686) host_arch=i386 ;;	72	x86_64\|amd64\|x64\|i[3-9]86\|i86pc\|x86\|x86pc\|k5\|k6\|k6_2\|k6_3\|k6-2\|k6-3\|pentium\|athlon*\|i586_i686\|i586-i686) host_arch=i386 ;;
73	ia64) host_arch=ia64 ;;	73	ia64) host_arch=ia64 ;;
Lines 76-82 Link Here
76	alpha) host_arch=alpha ;;	76	alpha) host_arch=alpha ;;
77	sun4\|sparc) host_arch=sparc ;;	77	sun4\|sparc) host_arch=sparc ;;
78	parisc\|hppa\|9000*) host_arch=hppa ;;	78	parisc\|hppa\|9000*) host_arch=hppa ;;
79	@@ -1962,7 +1927,11 @@ echocheck "working compiler"	79	@@ -1970,7 +1935,11 @@ echocheck "working compiler"
80	cflag_check "" \|\| die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."	80	cflag_check "" \|\| die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
81	echo "yes"	81	echo "yes"
82		82
Lines 89-95 Link Here
89		89
90	if test -z "$_target" ; then	90	if test -z "$_target" ; then
91	cat > $TMPC << EOF	91	cat > $TMPC << EOF
92	@@ -3090,7 +3059,7 @@ if x86_32 ; then	92	@@ -3100,7 +3069,7 @@ if x86_32 ; then
93	_pref_as_version='2.16.92'	93	_pref_as_version='2.16.92'
94	echo 'pabsd %xmm0, %xmm1' >> $TMPS	94	echo 'pabsd %xmm0, %xmm1' >> $TMPS
95	fi	95	fi
Lines 98-104 Link Here
98		98
99	if test "$as_verc_fail" != yes ; then	99	if test "$as_verc_fail" != yes ; then
100	echores "ok"	100	echores "ok"
101	@@ -3357,6 +3326,13 @@ if arm ; then	101	@@ -3367,6 +3336,13 @@ if arm ; then
102	fi	102	fi
103	echores "$setend"	103	echores "$setend"
104		104
Lines 112-118 Link Here
112	echocheck "softfloat ABI"	112	echocheck "softfloat ABI"
113	softfloat=yes	113	softfloat=yes
114	cpp_condition_check '' 'defined(__ARM_PCS_VFP) \|\| (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no	114	cpp_condition_check '' 'defined(__ARM_PCS_VFP) \|\| (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
115	@@ -4266,7 +4242,7 @@ echocheck "pthread"	115	@@ -4277,7 +4253,7 @@ echocheck "pthread"
116	if linux ; then	116	if linux ; then
117	THREAD_CFLAGS=-D_REENTRANT	117	THREAD_CFLAGS=-D_REENTRANT
118	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then	118	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then
Lines 121-127 Link Here
121	fi	121	fi
122	if test "$_pthreads" = auto ; then	122	if test "$_pthreads" = auto ; then
123	cat > $TMPC << EOF	123	cat > $TMPC << EOF
124	@@ -4276,7 +4252,7 @@ int main(void) { pthread_t tid; return pthread_create(	124	@@ -4287,7 +4263,7 @@ int main(void) { pthread_t tid; return pthread_create(
125	EOF	125	EOF
126	_pthreads=no	126	_pthreads=no
127	if ! hpux ; then	127	if ! hpux ; then
Lines 130-136 Link Here
130	# for crosscompilation, we cannot execute the program, be happy if we can link statically	130	# for crosscompilation, we cannot execute the program, be happy if we can link statically
131	cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run \|\| test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break	131	cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run \|\| test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
132	done	132	done
133	@@ -4419,7 +4395,7 @@ int main(void) {	133	@@ -4430,7 +4406,7 @@ int main(void) {
134	}	134	}
135	EOF	135	EOF
136	_iconv=no	136	_iconv=no
Lines 139-145 Link Here
139	cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&	139	cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
140	ld_iconv="$ld_tmp" && _iconv=yes && break	140	ld_iconv="$ld_tmp" && _iconv=yes && break
141	done	141	done
142	@@ -5866,15 +5842,6 @@ EOF	142	@@ -4460,7 +4436,7 @@ if test "$_termcap" = auto ; then
		143	_termcap=no
		144	for ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do
		145	statement_check term.h 'tgetent(0, 0)' $ld_tmp &&
		146	- extra_ldflags="$extra_ldflags $ld_tmp" &&
		147	+ extra_ldflags="-L%%LOCALBASE%%/ffmpeg4/lib $extra_ldflags $ld_tmp" &&
		148	ld_termcap="$ld_tmp" && _termcap=yes && break
		149	done
		150	fi
		151	@@ -5876,15 +5852,6 @@ EOF
143	break	152	break
144	fi	153	fi
145	done	154	done
Lines 155-161 Link Here
155	if win32 && cc_check -DGL_WIN32 -lopengl32 ; then	164	if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
156	_gl=yes	165	_gl=yes
157	_gl_win32=yes	166	_gl_win32=yes
158	@@ -6409,7 +6376,7 @@ elif darwin ; then	167	@@ -6419,7 +6386,7 @@ elif darwin ; then
159	elif dragonfly ; then	168	elif dragonfly ; then
160	default_cdrom_device="/dev/cd0"	169	default_cdrom_device="/dev/cd0"
161	elif freebsd ; then	170	elif freebsd ; then
Lines 164-170 Link Here
164	elif openbsd ; then	173	elif openbsd ; then
165	default_cdrom_device="/dev/rcd0c"	174	default_cdrom_device="/dev/rcd0c"
166	elif sunos ; then	175	elif sunos ; then
167	@@ -6422,7 +6389,7 @@ else	176	@@ -6432,7 +6399,7 @@ else
168	default_cdrom_device="/dev/cdrom"	177	default_cdrom_device="/dev/cdrom"
169	fi	178	fi
170		179
Lines 173-179 Link Here
173	default_dvd_device=$default_cdrom_device	182	default_dvd_device=$default_cdrom_device
174	elif darwin ; then	183	elif darwin ; then
175	default_dvd_device="/dev/rdiskN"	184	default_dvd_device="/dev/rdiskN"
176	@@ -6948,7 +6915,7 @@ echores "$_speex"	185	@@ -6959,7 +6926,7 @@ echores "$_speex"
177	echocheck "libgsm"	186	echocheck "libgsm"
178	if test "$_libgsm" = auto ; then	187	if test "$_libgsm" = auto ; then
179	_libgsm=no	188	_libgsm=no
Lines 182-188 Link Here
182	fi	191	fi
183	if test "$_libgsm" = yes ; then	192	if test "$_libgsm" = yes ; then
184	def_libgsm='#define CONFIG_LIBGSM 1'	193	def_libgsm='#define CONFIG_LIBGSM 1'
185	@@ -7424,6 +7391,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;	194	@@ -7391,6 +7358,16 @@ if test "$_librtmp" = yes && test "$networking" = yes;
186	nolibrtmp=no	195	nolibrtmp=no
187	def_librtmp='#define CONFIG_LIBRTMP 1'	196	def_librtmp='#define CONFIG_LIBRTMP 1'
188	inputmodules="librtmp $inputmodules"	197	inputmodules="librtmp $inputmodules"
Lines 199-205 Link Here
199	else	208	else
200	nolibrtmp=yes	209	nolibrtmp=yes
201	_librtmp=no	210	_librtmp=no
202	@@ -7813,7 +7790,7 @@ echores "$_mp3lame"	211	@@ -7808,7 +7785,7 @@ echores "$_mp3lame"
203	echocheck "mencoder"	212	echocheck "mencoder"
204	if test "$_mencoder" = no ; then	213	if test "$_mencoder" = no ; then
205	# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,	214	# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
Lines 208-219 Link Here
208	fi	217	fi
209	echores "$_mencoder"	218	echores "$_mencoder"
210		219
211	@@ -8419,7 +8396,7 @@ libs_mplayer=$ld_tmp	220	@@ -8414,7 +8391,7 @@ libs_mplayer=$ld_tmp
212		221
213	#############################################################################	222	#############################################################################
214		223
215	-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"	224	-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
216	+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"	225	+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
217		226
218	CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"	227	CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=c++98"
219		228