Re: [FFmpeg-devel] [PATCH] fate/source: Attempt to fix BSD sed

2016-02-12 Thread Michael Niedermayer
On Thu, Feb 11, 2016 at 10:27:47PM -0800, Timothy Gu wrote:
> I apparently used a GNU extension in the !{} syntax. Remove that rule
> and the cause of it.
> ---
>  cmdutils.h | 4 ++--
>  tests/fate/source-check.sh | 1 -
>  2 files changed, 2 insertions(+), 3 deletions(-)

on freebsd this results in:

...
": RE error: invalid repetition count(s)
libavutil/x86/w64xmmtest.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libavutil/x86_cpu.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libavutil/xga_font_data.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libavutil/xtea.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libpostproc/postprocess.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libpostproc/postprocess_internal.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libpostproc/version.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswresample/audioconvert.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswresample/resample.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswresample/swresample.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswresample/swresample_internal.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswresample/version.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswscale/ppc/yuv2rgb_altivec.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswscale/rgb2rgb.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswscale/swscale.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswscale/swscale_internal.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
libswscale/version.h
sed: 1: "s/[^A-Za-z0-9]\{1\,\}/_/g
": RE error: invalid repetition count(s)
tests/checkasm/checkasm.h

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Breaking DRM is a little like attempting to break through a door even
though the window is wide open and the only thing in the house is a bunch
of things you dont want and which you would get tomorrow for free anyway


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH] fate/source: Attempt to fix BSD sed

2016-02-12 Thread Henrik Gramner
On Fri, Feb 12, 2016 at 7:27 AM, Timothy Gu  wrote:
>  -e 's/[^A-Za-z0-9]\{1\,\}/_/g' \

I don't think the comma is supposed to be escaped.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH] fate/source: Attempt to fix BSD sed

2016-02-11 Thread Timothy Gu
I apparently used a GNU extension in the !{} syntax. Remove that rule
and the cause of it.
---
 cmdutils.h | 4 ++--
 tests/fate/source-check.sh | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cmdutils.h b/cmdutils.h
index 7f3db2a..83ea4ad 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_CMDUTILS_H
-#define FFMPEG_CMDUTILS_H
+#ifndef CMDUTILS_H
+#define CMDUTILS_H
 
 #include 
 
diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh
index 1947b52..50939f9 100755
--- a/tests/fate/source-check.sh
+++ b/tests/fate/source-check.sh
@@ -19,7 +19,6 @@ git grep -L -E "This file is part of FFmpeg|This file is part 
of libswresample|"
 echo Headers without standard inclusion guards:
 for f in `git ls-files | grep '\.h$'` ; do
 macro="`echo $f | sed \
--e '/\/\|^ff/!{s/\(.*\)/ffmpeg\/\1/}' \
 -e 's/^lib//' \
 -e 's/[^A-Za-z0-9]\{1\,\}/_/g' \
 -e 's/_\(a\|v\|av\)f_/_/' \
-- 
2.1.4

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel