* [gentoo-commits] gentoo-x86 commit in media-video/mplayer/files: dump_ffmpeg.sh
@ 2011-11-02 14:20 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2011-11-02 14:20 UTC (permalink / raw
To: gentoo-commits
aballier 11/11/02 14:20:13
Modified: dump_ffmpeg.sh
Log:
riff.h isnt needed anymore
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Revision Changes Path
1.2 media-video/mplayer/files/dump_ffmpeg.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?r1=1.1&r2=1.2
Index: dump_ffmpeg.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dump_ffmpeg.sh 8 Jun 2011 19:33:06 -0000 1.1
+++ dump_ffmpeg.sh 2 Nov 2011 14:20:13 -0000 1.2
@@ -61,8 +61,7 @@
# HEADERS (order matters for the consistency checks: leaves come first)
FILES=" libavutil/x86_cpu.h \
- libavformat/internal.h \
- libavformat/riff.h"
+ libavformat/internal.h "
# Files that are sed'ed but not compiled, used to check for availability of
# some codecs
FILES="${FILES} libavcodec/allcodecs.c libavformat/allformats.c"
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer/files: dump_ffmpeg.sh
@ 2015-02-14 20:43 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2015-02-14 20:43 UTC (permalink / raw
To: gentoo-commits
aballier 15/02/14 20:43:17
Modified: dump_ffmpeg.sh
Log:
bump a new snapshot that fixes bug #540062
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.7 media-video/mplayer/files/dump_ffmpeg.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?r1=1.6&r2=1.7
Index: dump_ffmpeg.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dump_ffmpeg.sh 11 Oct 2014 10:32:09 -0000 1.6
+++ dump_ffmpeg.sh 14 Feb 2015 20:43:17 -0000 1.7
@@ -60,7 +60,7 @@
}
# HEADERS (order matters for the consistency checks: leaves come first)
-FILES=" libavutil/x86/asm.h"
+FILES="libavutil/wchar_filename.h libavformat/os_support.h libavformat/internal.h libavutil/x86/asm.h"
# Files that are sed'ed but not compiled, used to check for availability of
# some codecs
FILES="${FILES} libavcodec/allcodecs.c libavformat/allformats.c libavfilter/allfilters.c"
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer/files: dump_ffmpeg.sh
@ 2014-10-11 10:32 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2014-10-11 10:32 UTC (permalink / raw
To: gentoo-commits
aballier 14/10/11 10:32:09
Modified: dump_ffmpeg.sh
Log:
dump_ffmpeg.sh: no need for x86_cpu.h nor lavf/internal.h anymore
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.6 media-video/mplayer/files/dump_ffmpeg.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?r1=1.5&r2=1.6
Index: dump_ffmpeg.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dump_ffmpeg.sh 8 Sep 2012 15:38:19 -0000 1.5
+++ dump_ffmpeg.sh 11 Oct 2014 10:32:09 -0000 1.6
@@ -60,9 +60,7 @@
}
# HEADERS (order matters for the consistency checks: leaves come first)
-FILES=" libavutil/x86/asm.h \
- libavutil/x86_cpu.h \
- libavformat/internal.h "
+FILES=" libavutil/x86/asm.h"
# Files that are sed'ed but not compiled, used to check for availability of
# some codecs
FILES="${FILES} libavcodec/allcodecs.c libavformat/allformats.c libavfilter/allfilters.c"
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer/files: dump_ffmpeg.sh
@ 2012-09-08 15:38 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2012-09-08 15:38 UTC (permalink / raw
To: gentoo-commits
aballier 12/09/08 15:38:19
Modified: dump_ffmpeg.sh
Log:
fix dump_ffmpeg script with latest ffmpeg git
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Revision Changes Path
1.5 media-video/mplayer/files/dump_ffmpeg.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?r1=1.4&r2=1.5
Index: dump_ffmpeg.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dump_ffmpeg.sh 11 Jun 2012 12:47:01 -0000 1.4
+++ dump_ffmpeg.sh 8 Sep 2012 15:38:19 -0000 1.5
@@ -60,7 +60,8 @@
}
# HEADERS (order matters for the consistency checks: leaves come first)
-FILES=" libavutil/x86_cpu.h \
+FILES=" libavutil/x86/asm.h \
+ libavutil/x86_cpu.h \
libavformat/internal.h "
# Files that are sed'ed but not compiled, used to check for availability of
# some codecs
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer/files: dump_ffmpeg.sh
@ 2011-12-18 14:56 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2011-12-18 14:56 UTC (permalink / raw
To: gentoo-commits
aballier 11/12/18 14:56:59
Modified: dump_ffmpeg.sh
Log:
allfilters.c is also checked, inlude it too
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Revision Changes Path
1.3 media-video/mplayer/files/dump_ffmpeg.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?r1=1.2&r2=1.3
Index: dump_ffmpeg.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dump_ffmpeg.sh 2 Nov 2011 14:20:13 -0000 1.2
+++ dump_ffmpeg.sh 18 Dec 2011 14:56:59 -0000 1.3
@@ -64,7 +64,7 @@
libavformat/internal.h "
# Files that are sed'ed but not compiled, used to check for availability of
# some codecs
-FILES="${FILES} libavcodec/allcodecs.c libavformat/allformats.c"
+FILES="${FILES} libavcodec/allcodecs.c libavformat/allformats.c libavfilter/allfilters.c"
for i in ${FILES} ; do
move_file $i
^ permalink raw reply [flat|nested] 6+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer/files: dump_ffmpeg.sh
@ 2011-06-08 19:33 Alexis Ballier (aballier)
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier (aballier) @ 2011-06-08 19:33 UTC (permalink / raw
To: gentoo-commits
aballier 11/06/08 19:33:06
Added: dump_ffmpeg.sh
Log:
Always use system ffmpeg, use only the required internal headers from ffmpeg, bug #361731
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Revision Changes Path
1.1 media-video/mplayer/files/dump_ffmpeg.sh
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/files/dump_ffmpeg.sh?rev=1.1&content-type=text/plain
Index: dump_ffmpeg.sh
===================================================================
#!/bin/sh
FFMPEG_DIR=ffmpeg
FFMPEG_MOVED_DIR=ffmpeg_removed
SYSTEM_FFMPEG_DIR=${EPREFIX}/usr/include
# Move directories
[ -d "${FFMPEG_DIR}/.git" ] && mv "${FFMPEG_DIR}" "${FFMPEG_MOVED_DIR}"
[ -d "${FFMPEG_MOVED_DIR}" ] || exit 1
[ -d "${FFMPEG_DIR}" ] || mkdir "${FFMPEG_DIR}"
# Keep required files and check them
SANITIZED_REGEXP='^\#[[:space:]]*include.*\".*[.]h\"'
sanitize_includes() {
sed -e "s/^\#[[:space:]]*include.*\"config[.]h\"/#include <config.h>/" \
-e "s/^\#[[:space:]]*include.*\"\(libav.*\/.*[.]h\)\"/#include \<\1\>/" \
-e "/${SANITIZED_REGEXP}/{s:\"\(.*\)\":\<${2}\/\1\>:}" ${1}
}
check_sanitized_includes() {
grep -q "${SANITIZED_REGEXP}" $1
}
get_header_deps() {
grep "^#[[:space:]]*include.*\<libav.*[.]h\>" ${1} | \
sed -e "s/^#[[:space:]]*include.*\<\(libav.*[.]h\)\>/\1/" | \
tr -d '<>' | tr '\n' ' '
}
check_header_deps() {
for i ; do
printf "Checking for the presence of ${i}...\n"
if [ ! -f "${SYSTEM_FFMPEG_DIR}/${i}" -a ! -f "${FFMPEG_DIR}/${i}" ] ; then
printf "Header depends on ${i}\n"
printf "... but that file cannot be found, aborting\n"
exit 1
fi
done
}
move_file() {
mydir="$(dirname $1)"
printf "Moving and checking file: ${1}\n"
[ -d "${FFMPEG_DIR}/${mydir}" ] || mkdir -p "${FFMPEG_DIR}/${mydir}"
if [ ! -f "${FFMPEG_DIR}/${1}" ] ; then
sanitize_includes "${FFMPEG_MOVED_DIR}/${1}" ${mydir} > "${FFMPEG_DIR}/${1}"
fi
if $(check_sanitized_includes "${FFMPEG_DIR}/${1}") ; then
printf "Error, found non sanitized file in ffmpeg:\n"
printf "${FFMPEG_DIR}/${1}\n"
printf "Please report it at bugs.gentoo.org\n"
exit 1
fi
if [ "${1%.h}" != "${1}" ] ; then
mydeps=$(get_header_deps "${FFMPEG_DIR}/${1}")
check_header_deps ${mydeps}
fi
}
# HEADERS (order matters for the consistency checks: leaves come first)
FILES=" libavutil/x86_cpu.h \
libavformat/internal.h \
libavformat/riff.h"
# Files that are sed'ed but not compiled, used to check for availability of
# some codecs
FILES="${FILES} libavcodec/allcodecs.c libavformat/allformats.c"
for i in ${FILES} ; do
move_file $i
done
rm -rf "${FFMPEG_MOVED_DIR}"
exit 0
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-02-14 20:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-02 14:20 [gentoo-commits] gentoo-x86 commit in media-video/mplayer/files: dump_ffmpeg.sh Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2015-02-14 20:43 Alexis Ballier (aballier)
2014-10-11 10:32 Alexis Ballier (aballier)
2012-09-08 15:38 Alexis Ballier (aballier)
2011-12-18 14:56 Alexis Ballier (aballier)
2011-06-08 19:33 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox