[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: x262: fix sed call when globbing files

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
96379954 by Johannes Kauffmann at 2023-01-26T08:44:12+00:00
contrib: x262: fix sed call when globbing files

The sed call tried to glob the Makefile and *.h files in the contrib
directory, instead of the x262 source directory:

  sed -i -e 's/x264_config/x262_config/g' *.h Makefile x262/*.c
  sed: can't read *.h: No such file or directory
  make: *** [../src/x262/rules.mak:31: .x262] Error 2

Regression from 637d00420fa1a3f4b71215ba869cb5d05bb7bead.

- - - - -
ee858cc7 by Johannes Kauffmann at 2023-01-26T08:44:12+00:00
contrib: x262: fix cp call

The cp call is broken:

  cp x262/vlc_build/x264.h x262/vlc_build/x262.h
  cp: cannot stat 'x262/vlc_build/x264.h': No such file or directory
  make: *** [../src/x262/rules.mak:37: .x262] Error 1

x264.h isn't generated inside the build directory (x262/vlc_build), but
exists in the x262 source directory. The install rules also install it
from the source directory. Therefore, copy it from and to the source
dir, not the build dir.

Regression from 697a2fcda3321c44f0ef2898b513851ba699ade7.

- - - - -


1 changed file:

- contrib/src/x262/rules.mak


Changes:

=====================================
contrib/src/x262/rules.mak
=====================================
@@ -28,12 +28,12 @@ x262: $(TARBALLS)/x262-git.tar.xz .sum-x262
 .x262: x262
 	$(REQUIRE_GPL)
 	sed -i -e 's/x264/x262/g' $</configure
-	sed -i -e 's/x264_config/x262_config/g' *.h Makefile $(UNPACK_DIR)/*.c
+	sed -i -e 's/x264_config/x262_config/g' $</*.h $</Makefile $</*.c
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(X264CONF)
 	sed -i -e 's/x264.pc/x262.pc/g' $(BUILD_DIR)/Makefile
 	sed -i -e 's/x264.h/x262.h/g' $(BUILD_DIR)/Makefile
 	+$(MAKEBUILD)
-	cp $(BUILD_DIR)/x264.h $(BUILD_DIR)/x262.h
+	cp $</x264.h $</x262.h
 	+$(MAKEBUILD) install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/277d7311d1dc854c5c0a2fecfa3cdfab50a10b3c...ee858cc75cf42b9374f28d5cb8db3de1baf3b7a7

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/277d7311d1dc854c5c0a2fecfa3cdfab50a10b3c...ee858cc75cf42b9374f28d5cb8db3de1baf3b7a7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance